- new SDL.dll (with a quick and dirty workaround for the hanging-mouse problem)

- changing of sorting and folder-option (on/off) does not need any restart now
- a lot of code clean up
- some bugfixes... i hope... dont't know which...

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

1 files changed, 20 insertions, 2 deletions

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index ccf14978..ccd9d07c 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -134,6 +134,12 @@ begin
         begin

           Music.PlayBack;

           Visible := False;

+          if(ScreenSong.Mode = smNormal) and not ScreenSong.MakeMedley then

+          begin

+            ScreenSong.WaitHandler.changed := true;

+            ScreenSong.WaitHandler.change_time := 0;

+          end;

+          CatSongs.Selected := Interaction;

         end;

 

       SDLK_RETURN:

@@ -192,8 +198,8 @@ begin
 end;

 

 constructor TScreenSongMenu.Create;

-var

-  I:    integer;

+{var

+  I:    integer;}

 begin

   inherited Create;

   

@@ -540,6 +546,8 @@ begin
           4: //Button 4

             begin

               PlaylistMan.AddItem(ScreenSong.Interaction, SelectValue);

+              ScreenSong.WaitHandler.changed := true;

+              ScreenSong.WaitHandler.change_time := 0;

               Visible := False;

             end;

         end;

@@ -559,6 +567,8 @@ begin
               PlaylistMan.AddItem(

               ScreenSong.Interaction,

               PlaylistMan.AddPlaylist(Button[0].Text[0].Text));

+              ScreenSong.WaitHandler.changed := true;

+              ScreenSong.WaitHandler.change_time := 0;

               Visible := False;

             end;

 

@@ -570,6 +580,8 @@ begin
 

           4: //Button 4

             begin

+              ScreenSong.WaitHandler.changed := true;

+              ScreenSong.WaitHandler.change_time := 0;

               Visible := False;

             end;

         end;

@@ -583,6 +595,8 @@ begin
             begin

               //Delete

               PlayListMan.DelItem(PlayListMan.GetIndexbySongID(ScreenSong.Interaction));

+              ScreenSong.WaitHandler.changed := true;

+              ScreenSong.WaitHandler.change_time := 0;

               Visible := False;

             end;

 

@@ -604,6 +618,8 @@ begin
             begin

               //Load Playlist

               PlaylistMan.SetPlayList(SelectValue);

+              ScreenSong.WaitHandler.changed := true;

+              ScreenSong.WaitHandler.change_time := 0;

               Visible := False;

             end;

         end;

@@ -617,6 +633,8 @@ begin
             begin

               //Delete

               PlayListMan.DelPlaylist(PlaylistMan.CurPlayList);

+              ScreenSong.WaitHandler.changed := true;

+              ScreenSong.WaitHandler.change_time := 0;

               Visible := False;

             end;