diff options
Diffstat (limited to '')
| -rw-r--r-- | Lua/src/screens/UScreenSongMenu.pas | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Lua/src/screens/UScreenSongMenu.pas b/Lua/src/screens/UScreenSongMenu.pas index 7aa2e498..72be93db 100644 --- a/Lua/src/screens/UScreenSongMenu.pas +++ b/Lua/src/screens/UScreenSongMenu.pas @@ -404,15 +404,18 @@ begin CurMenu := sMenu; Text[0].Text := Language.Translate('SONG_MENU_NAME_PARTY_JOKER'); // to-do : Party - {Button[0].Visible := (PartySession.Teams.NumTeams >= 1) AND (PartySession.Teams.Teaminfo[0].Joker > 0); - Button[1].Visible := (PartySession.Teams.NumTeams >= 2) AND (PartySession.Teams.Teaminfo[1].Joker > 0); - Button[2].Visible := (PartySession.Teams.NumTeams >= 3) AND (PartySession.Teams.Teaminfo[2].Joker > 0);} + Button[0].Visible := (Length(Party.Teams) >= 1) AND (Party.Teams[0].JokersLeft > 0); + Button[1].Visible := (Length(Party.Teams) >= 2) AND (Party.Teams[1].JokersLeft > 0); + Button[2].Visible := (Length(Party.Teams) >= 3) AND (Party.Teams[2].JokersLeft > 0); Button[3].Visible := True; SelectsS[0].Visible := False; - {Button[0].Text[0].Text := String(PartySession.Teams.Teaminfo[0].Name); - Button[1].Text[0].Text := String(PartySession.Teams.Teaminfo[1].Name); - Button[2].Text[0].Text := String(PartySession.Teams.Teaminfo[2].Name);} + if (Button[0].Visible) then + Button[0].Text[0].Text := String(Party.Teams[0].Name); + if (Button[1].Visible) then + Button[1].Text[0].Text := String(Party.Teams[1].Name); + if (Button[2].Visible) then + Button[2].Text[0].Text := String(Party.Teams[2].Name); Button[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL'); //Set right Interaction @@ -616,7 +619,7 @@ begin 0: //Button 1 begin //Start Singing - ScreenSong.StartSong; + Party.CallAfterSongSelect; Visible := False; end; |