New plugin mode reverted (will be moved to a branch afterwards).

Party mode might work again (untested). This might break linux compatibility.

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

1 files changed, 23 insertions, 25 deletions

diff --git a/src/screens/UScreenPartyNewRound.pas b/src/screens/UScreenPartyNewRound.pas
index 01de9df7..f95f2ff1 100644
--- a/src/screens/UScreenPartyNewRound.pas
+++ b/src/screens/UScreenPartyNewRound.pas
@@ -215,15 +215,15 @@ var
   function GetTeamPlayers(const Num: Byte): String;
   var
     Players: Array of String;
-    //J: Byte;
-  begin            // to-do : Party
-    if (Num-1 >= {PartySession.Teams.NumTeams}0) then
+    J: Byte;
+  begin
+    if (Num-1 >= PartySession.Teams.NumTeams) then
       exit;
 
-    {//Create Players Array
+    //Create Players Array
     SetLength(Players, PartySession.Teams.TeamInfo[Num-1].NumPlayers);
     For J := 0 to PartySession.Teams.TeamInfo[Num-1].NumPlayers-1 do
-      Players[J] := String(PartySession.Teams.TeamInfo[Num-1].PlayerInfo[J].Name);}
+      Players[J] := String(PartySession.Teams.TeamInfo[Num-1].PlayerInfo[J].Name);
 
     //Implode and Return
     Result := Language.Implode(Players);
@@ -231,12 +231,10 @@ var
 begin
   inherited;
 
-  // to-do : Party
-  //PartySession.StartRound;
+  PartySession.StartRound;
 
   //Set Visibility of Round Infos
-  // to-do : Party
-  I := {Length(PartySession.Rounds)}0;
+  I := Length(PartySession.Rounds);
   if (I >= 1) then
   begin
     Static[StaticRound1].Visible := True;
@@ -244,8 +242,8 @@ begin
     Text[TextWinner1].Visible := True;
 
     //Texts:
-    //Text[TextRound1].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[0].Plugin].Name);
-    //Text[TextWinner1].Text := PartySession.GetWinnerString(0);
+    Text[TextRound1].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[0].Plugin].Name);
+    Text[TextWinner1].Text := PartySession.GetWinnerString(0);
   end
   else
   begin
@@ -261,8 +259,8 @@ begin
     Text[TextWinner2].Visible := True;
 
     //Texts:
-    //Text[TextRound2].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[1].Plugin].Name);
-    //Text[TextWinner2].Text := PartySession.GetWinnerString(1);
+    Text[TextRound2].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[1].Plugin].Name);
+    Text[TextWinner2].Text := PartySession.GetWinnerString(1);
   end
   else
   begin
@@ -278,8 +276,8 @@ begin
     Text[TextWinner3].Visible := True;
 
     //Texts:
-    //Text[TextRound3].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[2].Plugin].Name);
-    //Text[TextWinner3].Text := PartySession.GetWinnerString(2);
+    Text[TextRound3].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[2].Plugin].Name);
+    Text[TextWinner3].Text := PartySession.GetWinnerString(2);
   end
   else
   begin
@@ -295,8 +293,8 @@ begin
     Text[TextWinner4].Visible := True;
 
     //Texts:
-    //Text[TextRound4].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[3].Plugin].Name);
-    //Text[TextWinner4].Text := PartySession.GetWinnerString(3);
+    Text[TextRound4].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[3].Plugin].Name);
+    Text[TextWinner4].Text := PartySession.GetWinnerString(3);
   end
   else
   begin
@@ -312,8 +310,8 @@ begin
     Text[TextWinner5].Visible := True;
 
     //Texts:
-    //Text[TextRound5].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[4].Plugin].Name);
-    //Text[TextWinner5].Text := PartySession.GetWinnerString(4);
+    Text[TextRound5].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[4].Plugin].Name);
+    Text[TextWinner5].Text := PartySession.GetWinnerString(4);
   end
   else
   begin
@@ -329,8 +327,8 @@ begin
     Text[TextWinner6].Visible := True;
 
     //Texts:
-    //Text[TextRound6].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[5].Plugin].Name);
-    //Text[TextWinner6].Text := PartySession.GetWinnerString(5);
+    Text[TextRound6].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[5].Plugin].Name);
+    Text[TextWinner6].Text := PartySession.GetWinnerString(5);
   end
   else
   begin
@@ -346,8 +344,8 @@ begin
     Text[TextWinner7].Visible := True;
 
     //Texts:
-    //Text[TextRound7].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[6].Plugin].Name);
-    //Text[TextWinner7].Text := PartySession.GetWinnerString(6);
+    Text[TextRound7].Text := Language.Translate(DllMan.Plugins[PartySession.Rounds[6].Plugin].Name);
+    Text[TextWinner7].Text := PartySession.GetWinnerString(6);
   end
   else
   begin
@@ -357,7 +355,7 @@ begin
   end;
 
   //Display Scores
-  {if (PartySession.Teams.NumTeams >= 1) then
+  if (PartySession.Teams.NumTeams >= 1) then
   begin
     Text[TextScoreTeam1].Text := InttoStr(PartySession.Teams.TeamInfo[0].Score);
     Text[TextNameTeam1].Text := String(PartySession.Teams.TeamInfo[0].Name);
@@ -445,7 +443,7 @@ begin
     Text[TextNextPlayer3].Visible := True;
   end
   else
-    Text[TextNextPlayer3].Visible := False;  }
+    Text[TextNextPlayer3].Visible := False;
 end;
 
 procedure TScreenPartyNewRound.SetAnimationProgress(Progress: real);