diff options
author | f1fth_freed0m <f1fth_freed0m@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-03-12 05:40:28 +0000 |
---|---|---|
committer | f1fth_freed0m <f1fth_freed0m@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-03-12 05:40:28 +0000 |
commit | 3086b0cb208ddda5fd4cc8934080c68f034194c2 (patch) | |
tree | 1f3ffda28869795044aef2291eb37be26cb5c854 /Game/Code/Screens | |
parent | a4accf241c7623b5b36e1e31bded05f94f662585 (diff) | |
download | usdx-3086b0cb208ddda5fd4cc8934080c68f034194c2.tar.gz usdx-3086b0cb208ddda5fd4cc8934080c68f034194c2.tar.xz usdx-3086b0cb208ddda5fd4cc8934080c68f034194c2.zip |
Added an skinable overlay in SingScreen to indicate if pause is enabled
Fixed the erroroutput of ZeroNote Check
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@955 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index 608bae72..964123aa 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -87,6 +87,7 @@ type {StaticP3RScoreBG: integer; TextP3RScore: integer;} + StaticPausePopup: integer; Tex_Background: TTexture; FadeOut: boolean; @@ -202,7 +203,7 @@ end; //Pause Mod procedure TScreenSing.Pause; begin - if not paused then //Pause einschalten + if not paused then //enable Pause begin // pause Time PauseTime := LineState.CurrentTime; @@ -216,7 +217,7 @@ begin fCurrentVideoPlaybackEngine.Pause; end - else //Pause ausschalten + else //disable Pause begin LineState.CurrentTime := PauseTime; //Position of Notes @@ -303,6 +304,9 @@ begin TextP3RScore := AddText(Theme.Sing.TextP3RScore); StaticP3SingBar := AddStatic(Theme.Sing.StaticP3SingBar);} + StaticPausePopup := AddStatic(Theme.Sing.PausePopUp); + Static[StaticPausePopup].Visible := false; //Pausepopup is not visibile at the beginning + if ScreenAct = 2 then begin // katze und affe @@ -347,7 +351,7 @@ begin Scores.Init; //Get Positions for Players - + // prepare players SetLength(Player, PlayersPlay); @@ -1212,8 +1216,7 @@ begin if ShowFinish then begin if (not AudioPlayback.Finished) and ((CurrentSong.Finish = 0) or (LineState.CurrentTime*1000 <= CurrentSong.Finish)) then begin //Pause Mod: - if not Paused then - Sing(Self); // analyze song + if not Paused then Sing(Self); // analyze song end else begin // Log.LogError('End'); if not FadeOut then begin @@ -1260,6 +1263,16 @@ begin for T := 0 to 1 do Text[T].X := Text[T].X - 10*ScreenX; + //Draw Pausepopup + //I use this workaround that the Static is drawen over the Lyrics, Lines, Scores and Effects + //maybe someone could find a better solution + if Paused then + begin + Static[StaticPausePopup].Visible := true; + Static[StaticPausePopup].Draw; + Static[StaticPausePopup].Visible := false; + end; + end; procedure TScreenSing.Finish; |