Partymodule finished.

All PartyScreens and SingScreen needs some adapting.

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

7 files changed, 66 insertions, 61 deletions

diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index 33543211..6f039080 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -181,23 +181,25 @@ var
   var
     Players: Array of String;
     J: Byte;
-  begin
-    if (Num-1 >= PartySession.Teams.NumTeams) then
+  begin            // to-do : Party
+    if (Num-1 >= {PartySession.Teams.NumTeams}0) 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);
   end;
 begin
-  PartySession.StartRound;
+  // to-do : Party
+  //PartySession.StartRound;
 
   //Set Visibility of Round Infos
-  I := Length(PartySession.Rounds);
+  // to-do : Party
+  I := {Length(PartySession.Rounds)}0;
   if (I >= 1) then
   begin
     Static[StaticRound1].Visible := True;
@@ -205,8 +207,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
@@ -222,8 +224,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
@@ -239,8 +241,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
@@ -256,8 +258,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
@@ -273,8 +275,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
@@ -290,8 +292,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
@@ -307,8 +309,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
@@ -318,7 +320,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);
@@ -406,7 +408,7 @@ begin
     Text[TextNextPlayer3].Visible := True;
   end
   else
-    Text[TextNextPlayer3].Visible := False;
+    Text[TextNextPlayer3].Visible := False;  }
 
 
 //  LCD.WriteText(1, '  Choose mode:  ');
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 1c5e8461..85ee65bc 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -81,10 +81,10 @@ begin
 
 
           //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 := Playlist;
@@ -113,7 +113,8 @@ begin
             PlaylistMan.CurPlayList := Playlist2;
 
           //Start Party
-          PartySession.StartNewParty(Rounds + 2);
+          // to-do : Party
+          //PartySession.StartNewParty(Rounds + 2);
 
           AudioPlayback.PlayStart;
           //Go to Player Screen
diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas
index 4aaa5a3e..3bd33a5c 100644
--- a/Game/Code/Screens/UScreenPartyPlayer.pas
+++ b/Game/Code/Screens/UScreenPartyPlayer.pas
@@ -193,7 +193,7 @@ begin
       SDLK_RETURN:

         begin

 

-          //Save PlayerNames

+          {//Save PlayerNames

           for I := 0 to PartySession.Teams.NumTeams-1 do

           begin

             PartySession.Teams.Teaminfo[I].Name := PChar(Button[I*5].Text[0].Text);

@@ -205,7 +205,7 @@ begin
           end;

 

           AudioPlayback.PlayStart;

-          FadeTo(@ScreenPartyNewRound);

+          FadeTo(@ScreenPartyNewRound);}

         end;

 

       // Up and Down could be done at the same time,

@@ -267,7 +267,7 @@ begin
     Button[10].Text[0].Text := Ini.NameTeam[2];

     // Templates for Names Mod end

   

-  If (PartySession.Teams.NumTeams>=1) then

+  {If (PartySession.Teams.NumTeams>=1) then

   begin

     Button[0].Visible := True;

     Button[1].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=1);

@@ -316,7 +316,7 @@ begin
     Button[12].Visible := False;

     Button[13].Visible := False;

     Button[14].Visible := False;

-  end;

+  end;   }

 

 end;

 

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index ea9b944b..6215e65a 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -60,21 +60,22 @@ begin
       SDLK_BACKSPACE :

         begin

           AudioPlayback.PlayStart;

-          if (PartySession.CurRound < High(PartySession.Rounds)) then

+          {if (PartySession.CurRound < High(PartySession.Rounds)) then

             FadeTo(@ScreenPartyNewRound)

-          else

+          else  // to-do : Party

           begin

-            PartySession.EndRound;

+            PartySession.EndRound;  }

             FadeTo(@ScreenPartyWin);

-          end;

+          //end;

         end;

 

       SDLK_RETURN:

         begin

           AudioPlayback.PlayStart;

-          if (PartySession.CurRound < High(PartySession.Rounds)) then

+          // to-do : Party

+          {if (PartySession.CurRound < High(PartySession.Rounds)) then

             FadeTo(@ScreenPartyNewRound)

-          else

+          else }

             FadeTo(@ScreenPartyWin);

         end;

     end;

@@ -182,11 +183,11 @@ begin
   if Static[StaticTeam2].Texture.ScaleW > 99 then Static[StaticTeam2].Texture.ScaleW := 99;

   if Static[StaticTeam3].Texture.ScaleW > 99 then Static[StaticTeam3].Texture.ScaleW := 99;

 

-  //End Last Round

-  PartySession.EndRound;

+  //End Last Round // to-do : Party

+  //PartySession.EndRound;

 

   //Set Winnertext

-  Text[TextWinner].Text := Format(Language.Translate('PARTY_SCORE_WINS'), [PartySession.GetWinnerString(PartySession.CurRound)]);

+  //Text[TextWinner].Text := Format(Language.Translate('PARTY_SCORE_WINS'), [PartySession.GetWinnerString(PartySession.CurRound)]);

 

   if (ScreenSingModi.PlayerInfo.NumPlayers >= 1) then

   begin

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index 9806159a..d8a3bd71 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -96,7 +96,7 @@ end;
 procedure TScreenPartyWin.onShow;

 var

   I: Integer;

-  Placing: TeamOrderArray;

+  Placing: Integer;

   Function GetTeamColor(Team: Byte): Cardinal;

   var

     NameString: String;

@@ -106,13 +106,13 @@ var
     Result := ColorExists(NameString);

   end;

 begin

+  // to-do : Party

   //Get Team Placing

-  Placing := PartySession.GetTeamOrder;

-  

-  //Set Winnertext

-  Text[TextWinner].Text := Format(Language.Translate('PARTY_SCORE_WINS'), [PartySession.Teams.Teaminfo[Placing[0]].Name]);

+  //Placing := PartySession.GetTeamOrder;

 

-  if (PartySession.Teams.NumTeams >= 1) then

+  //Set Winnertext

+  //Text[TextWinner].Text := Format(Language.Translate('PARTY_SCORE_WINS'), [PartySession.Teams.Teaminfo[Placing[0]].Name]);

+  {if (PartySession.Teams.NumTeams >= 1) then

   begin

     Text[TextScoreTeam1].Text := InttoStr(PartySession.Teams.TeamInfo[Placing[0]].Score);

     Text[TextNameTeam1].Text := String(PartySession.Teams.TeamInfo[Placing[0]].Name);

@@ -239,7 +239,7 @@ begin
     Static[StaticTeam3].Visible := False;

     Static[StaticTeam3BG].Visible := False;

     Static[StaticTeam3Deco].Visible := False;

-  end;

+  end;   }

 

 

 //  LCD.WriteText(1, '  Choose mode:  ');

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index bd9e5e67..8123ef03 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -660,36 +660,36 @@ begin
         end;
 
       SDLK_1:
-        begin //Jocker
-          if (Mode = 1) AND (PartySession.Teams.NumTeams >= 1) AND (PartySession.Teams.Teaminfo[0].Joker > 0) then
+        begin //Jocker // to-do : Party
+          {if (Mode = 1) AND (PartySession.Teams.NumTeams >= 1) AND (PartySession.Teams.Teaminfo[0].Joker > 0) then
           begin
             //Joker spielen
             Dec(PartySession.Teams.Teaminfo[0].Joker);
             SelectRandomSong;
             SetJoker;
-          end;
+          end;  }
         end;
 
       SDLK_2:
         begin //Jocker
-          if (Mode = 1) AND (PartySession.Teams.NumTeams >= 2) AND (PartySession.Teams.Teaminfo[1].Joker > 0) then
+          {if (Mode = 1) AND (PartySession.Teams.NumTeams >= 2) AND (PartySession.Teams.Teaminfo[1].Joker > 0) then
           begin
             //Joker spielen
             Dec(PartySession.Teams.Teaminfo[1].Joker);
             SelectRandomSong;
             SetJoker;
-          end;
+          end;  }
         end;
 
       SDLK_3:
         begin //Jocker
-          if (Mode = 1) AND (PartySession.Teams.NumTeams >= 3) AND (PartySession.Teams.Teaminfo[2].Joker > 0) then
+          {if (Mode = 1) AND (PartySession.Teams.NumTeams >= 3) AND (PartySession.Teams.Teaminfo[2].Joker > 0) then
           begin
             //Joker spielen
             Dec(PartySession.Teams.Teaminfo[2].Joker);
             SelectRandomSong;
             SetJoker;
-          end;
+          end; }
         end;
     end;
   end;
@@ -1991,7 +1991,8 @@ end;
 
 procedure TScreenSong.SetJoker;
 begin
-  //If Party Mode
+  {//If Party Mode
+  // to-do : Party
   if Mode = 1 then //Show Joker that are available
   begin
     if (PartySession.Teams.NumTeams >= 1) then
@@ -2064,7 +2065,7 @@ begin
     Static[StaticTeam3Joker3].Visible := False;
     Static[StaticTeam3Joker4].Visible := False;
     Static[StaticTeam3Joker5].Visible := False;
-  end;
+  end;  }
 end;
 
 procedure TScreenSong.SetStatics;
@@ -2132,13 +2133,13 @@ end;
 //Team No of Team (0-5)
 procedure TScreenSong.DoJoker (Team: Byte);
 begin
-  if (Mode = 1) AND (PartySession.Teams.NumTeams >= Team + 1) AND (PartySession.Teams.Teaminfo[Team].Joker > 0) then
+  {if (Mode = 1) AND (PartySession.Teams.NumTeams >= Team + 1) AND (PartySession.Teams.Teaminfo[Team].Joker > 0) then
   begin
     //Joker spielen
     Dec(PartySession.Teams.Teaminfo[Team].Joker);
     SelectRandomSong;
     SetJoker;
-  end;
+  end;  }
 end;
 
 //Detailed Cover Unloading. Unloads the Detailed, uncached Cover of the cur. Song
diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 90e56a54..88b0de32 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -373,16 +373,16 @@ begin
       begin
         CurMenu := sMenu;
         Text[0].Text := Language.Translate('SONG_MENU_NAME_PARTY_JOKER');
-
-        Button[0].Visible := (PartySession.Teams.NumTeams >= 1) AND (PartySession.Teams.Teaminfo[0].Joker > 0);
+        // 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[2].Visible := (PartySession.Teams.NumTeams >= 3) AND (PartySession.Teams.Teaminfo[2].Joker > 0);}
         Button[3].Visible := True;
         SelectsS[0].Visible := False;
 
-        Button[0].Text[0].Text := String(PartySession.Teams.Teaminfo[0].Name);
+        {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);
+        Button[2].Text[0].Text := String(PartySession.Teams.Teaminfo[2].Name);}
         Button[3].Text[0].Text := Language.Translate('SONG_MENU_CANCEL');
 
         //Set right Interaction