diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-05-02 15:29:37 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-05-02 15:29:37 +0000 |
| commit | 94e4421ad3a7615c7ce91beff95634c98b4edd49 (patch) | |
| tree | 7bcebb5913b9eb02757a6acabaf6274d3d82a51b /Lua/src/screens/UScreenSongMenu.pas | |
| parent | d2c6680bc0c2354b6c972402951b6118bf6843af (diff) | |
| download | usdx-94e4421ad3a7615c7ce91beff95634c98b4edd49.tar.gz usdx-94e4421ad3a7615c7ce91beff95634c98b4edd49.tar.xz usdx-94e4421ad3a7615c7ce91beff95634c98b4edd49.zip | |
Display.AbortScreenChange added (used in ScreenSing and ScreenPartyOptions)
some minor fixes in UParty, ULuaParty and ULuaUsdx
adapting of UScreenPartyNewRound, UScreenPartyPlayer and UScreenPartyOption nearly finished
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1705 b956fd51-792f-4845-bead-9b4dfca2ff2c
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; |