From 41e73f40aafbe9bf873f8fbdf46e092e58065341 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Sun, 21 Feb 2010 15:08:07 +0000 Subject: hide medley playlist when using medley surprise git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2135 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenSong.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Game/Code/Screens') diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index 001ff860..238db5e8 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -2053,7 +2053,9 @@ begin for I := 1 to 4 do begin - if Length(PlaylistMedley.Song)>=I+J then + if (Length(PlaylistMedley.Song)>=I+J) and (MakeMedley or + ((Mode=smParty) and not PartySession.Rounds[PartySession.CurRound].MedleySurprise) or + ((Mode=smChallenge) and not PartySessionM2.Rounds[PartySessionM2.CurRound].MedleySurprise)) then begin Text[TextMedley[I]].Visible := true; Text[TextMedley[I]].Text := IntToStr(I+J)+') ' + @@ -3134,7 +3136,7 @@ begin if (CatSongs.Song[I].Medley.Source >= MinS) and not PartyPlayedMedley(I) and not SongSkipped(I) then begin - if (PlaylistMan.Mode<>0) or ((PlaylistMan.Mode=0) and CatSongs.Song[I].Visible) then + if (PlaylistMan.Mode=0) or ((PlaylistMan.Mode<>0) and CatSongs.Song[I].Visible) then begin SetLength(res, Length(res)+1); res[Length(res)-1] := I; -- cgit v1.2.3