Added ability to Select Players before Song

Make Option OnSongClick Work

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@131 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 21 insertions, 2 deletions

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 79a5abb1..5814efbf 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -83,6 +83,7 @@ type
       procedure StartSong;

       procedure OpenEditor;

       procedure DoJoker(Team: Byte);

+      procedure SelectPlayers;

 

       //Extensions

       procedure DrawExtensions;

@@ -299,8 +300,17 @@ begin
             end else begin // clicked on song

               if (Mode = 0) then //Normal Mode -> Start Song

               begin

-                StartSong;

-

+                //Do the Action that is specified in Ini

+                case Ini.OnSongClick of

+                  0: StartSong;

+                  1: SelectPlayers;

+                  2:begin

+                      If (CatSongs.CatNumShow = -3) then

+                        ScreenSongMenu.MenuShow(SM_Playlist)

+                      else

+                        ScreenSongMenu.MenuShow(SM_Main);

+                    end;

+                end;

               end

               else if (Mode = 1) then //PartyMode -> Show Menu

               begin

@@ -1615,6 +1625,15 @@ begin
   end;

 end;

 

+procedure TScreenSong.SelectPlayers;

+begin

+  CatSongs.Selected := Interaction;

+  Music.Stop;

+

+  ScreenName.Goto_SingScreen := True;

+  FadeTo(@ScreenName);

+end;

+

 procedure TScreenSong.OpenEditor;

 begin

   if (Length(Songs.Song) > 0) and (not CatSongs.Song[Interaction].Main) AND (Mode = 0) then begin