merge with current trunk revision 1827

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

1 files changed, 7 insertions, 8 deletions

diff --git a/unicode/src/screens/UScreenPartyOptions.pas b/unicode/src/screens/UScreenPartyOptions.pas
index 74c51b15..b7226a5e 100644
--- a/unicode/src/screens/UScreenPartyOptions.pas
+++ b/unicode/src/screens/UScreenPartyOptions.pas
@@ -125,11 +125,11 @@ begin
           // Don't start when SinglePlayer Teams but only Multiplayer Plugins available
           OnlyMultiPlayer := true;
           for I := 0 to High(DLLMan.Plugins) do
-	  begin
+          begin
             OnlyMultiPlayer := (OnlyMultiPlayer and DLLMan.Plugins[I].TeamModeOnly);
           end;
           if (OnlyMultiPlayer) and ((NumPlayer1 = 0) or (NumPlayer2 = 0) or ((NumPlayer3 = 0) and (NumTeams = 1))) then
-	  begin
+          begin
             ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));
             Exit;
           end;
@@ -137,12 +137,11 @@ begin
           Ini.Difficulty := SelectsS[SelectLevel].SelectedOption;
           Ini.SaveLevel;
 
-
           //Save Num Teams:
-          {PartySession.Teams.NumTeams := NumTeams + 2;
+          PartySession.Teams.NumTeams := NumTeams + 2;
           PartySession.Teams.Teaminfo[0].NumPlayers := NumPlayer1+1;
           PartySession.Teams.Teaminfo[1].NumPlayers := NumPlayer2+1;
-          PartySession.Teams.Teaminfo[2].NumPlayers := NumPlayer3+1;}
+          PartySession.Teams.Teaminfo[2].NumPlayers := NumPlayer3+1;
 
           //Save Playlist
           PlaylistMan.Mode := TSingMode( Playlist );
@@ -171,8 +170,7 @@ begin
             PlaylistMan.CurPlayList := Playlist2;
 
           //Start Party
-          // to-do : Party
-          //PartySession.StartNewParty(Rounds + 2);
+          PartySession.StartNewParty(Rounds + 2);
 
           AudioPlayback.PlaySound(SoundLib.Start);
           //Go to Player Screen
@@ -258,7 +256,8 @@ begin
 end;
 
 procedure TScreenPartyOptions.SetPlaylist2;
-var I: integer;
+var
+  I: integer;
 begin
   case Playlist of
     0: