diff options
author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-04 20:46:56 +0000 |
---|---|---|
committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-06-04 20:46:56 +0000 |
commit | 9e20b144baa4591e9f384742cb90e40e79b315e6 (patch) | |
tree | 5644d487cd5fa6da3d1bcfca7f6f8b06bf92510e /Game/Code/Screens/UScreenPartyOptions.pas | |
parent | ea92932825739b6d7f5ac1434382a1a59a0371fd (diff) | |
download | usdx-9e20b144baa4591e9f384742cb90e40e79b315e6.tar.gz usdx-9e20b144baa4591e9f384742cb90e40e79b315e6.tar.xz usdx-9e20b144baa4591e9f384742cb90e40e79b315e6.zip |
- switched SDL.dll back to v1.2.12, the 1.2.14 has too much bugs
- added duet support. duet song format based on hawkears duet mod for the 1.1 alpha
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2440 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens/UScreenPartyOptions.pas')
-rw-r--r-- | Game/Code/Screens/UScreenPartyOptions.pas | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas index 8576b596..deeb8c96 100644 --- a/Game/Code/Screens/UScreenPartyOptions.pas +++ b/Game/Code/Screens/UScreenPartyOptions.pas @@ -235,6 +235,7 @@ begin PartySession.StartNewParty(Rounds + 2);
Music.PlayStart;
+
//Go to Player Screen
FadeTo(@ScreenPartyPlayer);
end;
@@ -491,7 +492,7 @@ begin SetLength(IPlaylist2, 0);
For I := 0 to high(CatSongs.Song) do
begin
- If (CatSongs.Song[I].Main) then
+ If CatSongs.Song[I].Main and (CatSongs.NumCatSongs(CatSongs.Song[I].OrderNum)>0) then
begin
SetLength(IPlaylist2, Length(IPlaylist2) + 1);
IPlaylist2[high(IPlaylist2)] := CatSongs.Song[I].Artist;
@@ -636,6 +637,7 @@ begin end;
SelectedPlugin := 0;
+ ScreenSong.Mode := smParty;
end;
procedure TScreenPartyOptions.SetAnimationProgress(Progress: real);
|