diff options
author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-05-02 15:29:37 +0000 |
---|---|---|
committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-05-02 15:29:37 +0000 |
commit | 94e4421ad3a7615c7ce91beff95634c98b4edd49 (patch) | |
tree | 7bcebb5913b9eb02757a6acabaf6274d3d82a51b /Lua/src/screens/UScreenSing.pas | |
parent | d2c6680bc0c2354b6c972402951b6118bf6843af (diff) | |
download | usdx-94e4421ad3a7615c7ce91beff95634c98b4edd49.tar.gz usdx-94e4421ad3a7615c7ce91beff95634c98b4edd49.tar.xz usdx-94e4421ad3a7615c7ce91beff95634c98b4edd49.zip |
Display.AbortScreenChange added (used in ScreenSing and ScreenPartyOptions)
some minor fixes in UParty, ULuaParty and ULuaUsdx
adapting of UScreenPartyNewRound, UScreenPartyPlayer and UScreenPartyOption nearly finished
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1705 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | Lua/src/screens/UScreenSing.pas | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Lua/src/screens/UScreenSing.pas b/Lua/src/screens/UScreenSing.pas index d49ecc7c..001fa8a3 100644 --- a/Lua/src/screens/UScreenSing.pas +++ b/Lua/src/screens/UScreenSing.pas @@ -101,6 +101,14 @@ type fShowVisualization: boolean; fCurrentVideoPlaybackEngine: IVideoPlayback; + // some settings to be set by plugins + settings: record + + + + end; + procedure ClearSettings; + constructor Create; override; procedure onShow; override; procedure onShowFinish; override; @@ -126,6 +134,7 @@ uses UGraphic, Classes, URecord, ULanguage, + UDisplay, Math; // Method for input parsing. If False is returned, GetNextWindow @@ -433,8 +442,8 @@ begin if (not success) then begin - // error loading song -> go back to song screen and show some error message - FadeTo(@ScreenSong); + // error loading song -> go back to previous screen and show some error message + Display.AbortScreenChange; // select new song in party mode if ScreenSong.Mode = smPartyMode then ScreenSong.SelectRandomSong(); @@ -621,6 +630,11 @@ begin CountSkipTimeSet; end; +procedure TScreenSing.ClearSettings; +begin + +end; + procedure TScreenSing.onHide; begin // Unload background texture @@ -821,7 +835,7 @@ begin //Kill all Stars and Effects GoldenRec.KillAll; - + if (Ini.SavePlayback = 1) then begin Log.BenchmarkStart(0); |