- added webcam support

- faster program start
- faster sorting (mergesort)
- sync lyrics to music
- some new backgrounds and credits graphics (thx to MezzoX)
- own thread for video decoding
- finished 6-Player-on-one-screen-mode
- changqed player-colors
- fixed some bugs...

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

1 files changed, 7 insertions, 6 deletions

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 72ec1337..dbdea42e 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -151,8 +151,7 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE,

-      SDLK_BACKSPACE :

+      SDLK_ESCAPE:

         begin

           Music.PlayBack;

           Visible := False;

@@ -180,9 +179,10 @@ begin
           if (CurMenu = SM_Sort) then

             Button[3].Visible := (Ini.Sorting <> SelectValue);

 

-          if (ScreenSong.Mode = smParty) and (ScreenSong.Sel3<=0) then

+          if (ScreenSong.Mode = smParty) and (PartySession.Rand3) and (ScreenSong.Sel3<=0) then

           begin

-            Inc(ScreenSong.Sel3);

+            if (ScreenSong.Sel3<1) then

+              Inc(ScreenSong.Sel3);

             Music.PlayChange;

             ScreenSong.SelectNext;

             ScreenSong.ChangeMusic;

@@ -197,9 +197,10 @@ begin
           if (CurMenu = SM_Sort) then

             Button[3].Visible := (Ini.Sorting <> SelectValue);

 

-          if (ScreenSong.Mode = smParty) and (ScreenSong.Sel3>=0) then

+          if (ScreenSong.Mode = smParty) and (PartySession.Rand3) and (ScreenSong.Sel3>=0) then

           begin

-            Dec(ScreenSong.Sel3);

+            if (ScreenSong.Sel3>-1) then

+              Dec(ScreenSong.Sel3);

             Music.PlayChange;

             ScreenSong.SelectPrev;

             ScreenSong.ChangeMusic;