Fixed: Select a not Visible Button in Joker Menu, if the first Team has no Joker

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

1 files changed, 17 insertions, 2 deletions

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 699e0b92..d4ad8016 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -329,8 +329,8 @@ begin
         SelectsS[0].Visible := False;

 

         Button[0].Text[0].Text := Language.Translate('SONG_MENU_PLAY');

-        Button[1].Text[0].Text := Language.Translate('SONG_MENU_JOKER');

-        Button[2].Text[0].Text := Language.Translate('SONG_MENU_PLAYMODI');

+        //Button[1].Text[0].Text := Language.Translate('SONG_MENU_JOKER');

+        //Button[2].Text[0].Text := Language.Translate('SONG_MENU_PLAYMODI');

         Button[3].Text[0].Text := Language.Translate('SONG_MENU_JOKER');

       end;

 

@@ -349,6 +349,21 @@ begin
         Button[1].Text[0].Text := String(PartySession.Teams.Teaminfo[1].Name);

         Button[2].Text[0].Text := String(PartySession.Teams.Teaminfo[2].Name);

         Button[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL');

+

+        //Set right Interaction

+        if (not Button[0].Visible) then

+        begin

+          if (not Button[1].Visible) then

+          begin

+            if (not Button[2].Visible) then

+            begin

+              Interaction := 4;

+            end

+            else Interaction := 2;

+          end

+          else Interaction := 1;

+        end;

+        

       end;

   end;

 end;