aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenSing.pas
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-08 19:00:47 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-08 19:00:47 +0000
commitb61e647b67ac0d449d764b89b117a3ac8b603403 (patch)
treef94140bec26b23ff7cc82be4da2c0739d1c16ee1 /Game/Code/Screens/UScreenSing.pas
parent67b726eecadbfdc9a02827e8ecab07a5c0762708 (diff)
downloadusdx-b61e647b67ac0d449d764b89b117a3ac8b603403.tar.gz
usdx-b61e647b67ac0d449d764b89b117a3ac8b603403.tar.xz
usdx-b61e647b67ac0d449d764b89b117a3ac8b603403.zip
Readded Q Shortcut (Exit Application) on all Screens
Clean up Popup Code a little bit git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@180 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenSing.pas25
1 files changed, 12 insertions, 13 deletions
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 3e66b197..6985672f 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -92,6 +92,17 @@ begin
If (PressedDown) Then
begin // Key Down
case PressedKey of
+ SDLK_Q:
+ begin
+ //When not ask before Exit then Finish now
+ if (Ini.AskbeforeDel <> 1) then
+ Finish
+ //else just Pause and let the Popup make the Work
+ else if not paused then
+ Pause;
+
+ Result := false;
+ end;
SDLK_ESCAPE :
begin
//Record Sound Hack:
@@ -102,12 +113,6 @@ begin
FadeTo(@ScreenScore);
end;
- SDLK_Q:
- begin
- Finish;
- Result := false;
- end;
-
SDLK_P://Pause Mod
begin
Pause;
@@ -127,13 +132,7 @@ begin
begin
end;
end;
- end
- else // Key Up
- case PressedKey of
- SDLK_RETURN :
- begin
- end;
- end;
+ end;
end;
//Pause Mod