aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2011-02-23 16:46:45 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2011-02-23 16:46:45 +0000
commitcb235b3865b4cf915b0e58318477201950e48978 (patch)
treeff0bf9f6c227ae41568ccf3b5c365aa39ceda50d /Game
parentd5cf0ceae7fbbdb0ed21685e05c18541fb71675b (diff)
downloadusdx-cb235b3865b4cf915b0e58318477201950e48978.tar.gz
usdx-cb235b3865b4cf915b0e58318477201950e48978.tar.xz
usdx-cb235b3865b4cf915b0e58318477201950e48978.zip
some (small) bugfixes in editor
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2804 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas16
1 files changed, 9 insertions, 7 deletions
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index fe6993f7..7d61a0dd 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -157,7 +157,7 @@ const
NumHalftones = 36;
implementation
-uses UGraphic, UDraw, UMain, USkins, ULanguage;
+uses UGraphic, UDisplay, UDraw, UMain, USkins, ULanguage;
// Method for input parsing. If False is returned, GetNextWindow
// should be checked to know the next window to load;
@@ -193,15 +193,17 @@ begin
SDLK_ESCAPE:
begin
- Music.Close;
- acClose;
-
- FadeTo(@ScreenSong);
+ CheckFadeTo(@ScreenSong,'Do you really want to quit?');
+ if (Display.NextScreen <> nil) then
+ begin
+ Music.Close;
+ acClose;
+ end;
end;
SDLK_Q:
begin
- Result := false;
+ //Result := false;
end;
SDLK_BACKQUOTE:
@@ -713,7 +715,7 @@ begin
if (SDL_ModState = 0) then
begin
// Set actual note over pitch detection
- Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[0]].Ton := ActTonePitch;
+ Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Ton := ActTonePitch;
end;
end;