- switched SDL.dll back to v1.2.12, the 1.2.14 has too much bugs

- added duet support. duet song format based on hawkears duet mod for the 1.1 alpha

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2440 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 19 insertions, 9 deletions

diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas
index c373b2d9..c698b046 100644
--- a/Game/Code/Screens/UScreenOptionsGame.pas
+++ b/Game/Code/Screens/UScreenOptionsGame.pas
@@ -7,12 +7,16 @@ uses
 

 type

   TScreenOptionsGame = class(TMenu)

-    public

+    private

       old_Tabs, old_Sorting: integer;

+

+      procedure Leave;

+      procedure RefreshSongs;

+      

+    public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

-      procedure RefreshSongs;

   end;

 

 const

@@ -40,16 +44,13 @@ begin
       SDLK_ESCAPE,

       SDLK_BACKSPACE :

         begin

-          Music.PlayBack;

-          RefreshSongs;

-          FadeTo(@ScreenOptions);

+          Leave;

         end;

       SDLK_RETURN:

         begin

-          if SelInteraction = 7 then begin

-            Music.PlayBack;

-            RefreshSongs;

-            FadeTo(@ScreenOptions);

+          if SelInteraction = 7 then

+          begin

+            Leave;

           end;

         end;

       SDLK_DOWN:

@@ -116,4 +117,13 @@ begin
   old_Tabs    := Ini.Tabs;

 end;

 

+procedure TScreenOptionsGame.Leave;

+begin

+

+

+  Music.PlayBack;

+  RefreshSongs;

+  FadeTo(@ScreenOptions);

+end;

+

 end.
\ No newline at end of file