diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-28 15:42:13 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-28 15:42:13 +0000 |
| commit | 075cb824a31c5e6e1cc6ee6f0087ac5598ba003a (patch) | |
| tree | 79c6ab9714b3de00fad987520d1725842fccb19d /Game/Code/Screens | |
| parent | 4bde4923ef5b947d11ee4eb6f99d30b5ea43bce0 (diff) | |
| download | usdx-075cb824a31c5e6e1cc6ee6f0087ac5598ba003a.tar.gz usdx-075cb824a31c5e6e1cc6ee6f0087ac5598ba003a.tar.xz usdx-075cb824a31c5e6e1cc6ee6f0087ac5598ba003a.zip | |
- new option "PossibleScore": show max possible score in singscreen (toggle on/off with "S")
- fade the "ball" also
- fixed screensong preview volume
- update of acinerella
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2565 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens')
| -rw-r--r-- | Game/Code/Screens/UScreenOptionsSound.pas | 2 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 13 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas index 6735abea..b9969aa5 100644 --- a/Game/Code/Screens/UScreenOptionsSound.pas +++ b/Game/Code/Screens/UScreenOptionsSound.pas @@ -40,6 +40,7 @@ begin begin
Ini.Save;
Music.PlayBack;
+ ScreenSong.MP3Volume := Ini.PreviewVolume * 10;
FadeTo(@ScreenOptions);
end;
SDLK_RETURN:
@@ -47,6 +48,7 @@ begin if SelInteraction = 6 then begin
Ini.Save;
Music.PlayBack;
+ ScreenSong.MP3Volume := Ini.PreviewVolume * 10;
FadeTo(@ScreenOptions);
end;
end;
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index e07d5023..fbf128b0 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -15,8 +15,8 @@ type protected
paused: boolean; //Pause Mod
PauseTime: Real;
- NumEmptySentences: array [0..1] of integer;
public
+ NumEmptySentences: array [0..1] of integer;
//TextTime: integer;
MP3Volume: integer;
MP3VolumeHandler: THandler;
@@ -213,6 +213,12 @@ begin begin
Pause;
end;
+
+ SDLK_S:
+ begin
+ Ini.PossibleScore := (Ini.PossibleScore+1) mod 2;
+ Ini.Save;
+ end;
SDLK_RETURN:
begin
@@ -1766,8 +1772,9 @@ begin Player[I].LineBonus_Text := Theme.Sing.LineBonusText[Floor(A)];
//PhrasenBonus give Points
- Player[I].ScoreLine := Player[I].ScoreLine +
- (1000 / (Length(Czesci[CP].Czesc) - NumEmptySentences[CP]) * A / 8);
+ if (Length(Czesci[CP].Czesc) - NumEmptySentences[CP])>0 then
+ Player[I].ScoreLine := Player[I].ScoreLine +
+ (1000 / (Length(Czesci[CP].Czesc) - NumEmptySentences[CP]) * A / 8);
Player[I].ScoreLineI := Round(Player[I].ScoreLine / 10) * 10;
//Update Total Score
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 596eec57..56590166 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -2452,7 +2452,7 @@ begin try
acGetFrame(Czas.Teraz);
- Blend := (CoverTime-1.75)/Ini.PreviewFading;
+ Blend := (CoverTime-1.75)/2;
if Blend<0 then
Blend := 0
else if Blend>1 then
@@ -2855,7 +2855,7 @@ end; procedure TScreenSong.ChangeMusic;
begin
//When Music Preview is avtivated -> then Change Music
- if (Ini.PreviewVolume <> 0) then
+ if (Ini.PreviewVolume >= 0) then
begin
if (NOT CatSongs.Song[Interaction].Main) AND(CatSongs.VisibleSongs > 0) then
begin
@@ -2929,7 +2929,7 @@ end; procedure TScreenSong.StartVideoPreview;
begin
- if (Ini.PreviewVolume <> 0) and (Ini.MovieSize < 3) then
+ if (Ini.PreviewVolume >= 0) and (Ini.MovieSize < 3) then
begin
if (NOT CatSongs.Song[Interaction].Main) AND (CatSongs.VisibleSongs > 0) then
begin
|