From 544d6b5d3ebc527245d20542b6130baef315b715 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 27 Jun 2009 21:40:55 +0000
Subject: merged r1830 trunk (current) in this branch add some files to
 svn:ignore

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1831 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/screens/UScreenPartyPlayer.pas | 94 +++++++++++++++---------------
 1 file changed, 47 insertions(+), 47 deletions(-)

(limited to 'unicode/src/screens/UScreenPartyPlayer.pas')

diff --git a/unicode/src/screens/UScreenPartyPlayer.pas b/unicode/src/screens/UScreenPartyPlayer.pas
index 3e453058..9f40983a 100644
--- a/unicode/src/screens/UScreenPartyPlayer.pas
+++ b/unicode/src/screens/UScreenPartyPlayer.pas
@@ -45,26 +45,26 @@ uses
 type
   TScreenPartyPlayer = class(TMenu)
     public
-      Team1Name: Cardinal;
-      Player1Name: Cardinal;
-      Player2Name: Cardinal;
-      Player3Name: Cardinal;
-      Player4Name: Cardinal;
-
-      Team2Name: Cardinal;
-      Player5Name: Cardinal;
-      Player6Name: Cardinal;
-      Player7Name: Cardinal;
-      Player8Name: Cardinal;
-
-      Team3Name: Cardinal;
-      Player9Name: Cardinal;
-      Player10Name: Cardinal;
-      Player11Name: Cardinal;
-      Player12Name: Cardinal;
+      Team1Name: cardinal;
+      Player1Name: cardinal;
+      Player2Name: cardinal;
+      Player3Name: cardinal;
+      Player4Name: cardinal;
+
+      Team2Name: cardinal;
+      Player5Name: cardinal;
+      Player6Name: cardinal;
+      Player7Name: cardinal;
+      Player8Name: cardinal;
+
+      Team3Name: cardinal;
+      Player9Name: cardinal;
+      Player10Name: cardinal;
+      Player11Name: cardinal;
+      Player12Name: cardinal;
 
       constructor Create; override;
-      function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       procedure onShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
@@ -79,9 +79,11 @@ uses
   UParty,
   UUnicodeUtils;
 
-function TScreenPartyPlayer.ParseInput(PressedKey: Cardinal; CharCode: UCS4Char; PressedDown: Boolean): Boolean;
+function TScreenPartyPlayer.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 var
-  SDL_ModState:  Word;
+  SDL_ModState:  word;
+  I, J: integer;
+
   procedure IntNext;
   begin
     repeat
@@ -245,7 +247,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);
@@ -256,8 +258,8 @@ begin
             end;
           end;
 
-          AudioPlayback.PlayStart;
-          FadeTo(@ScreenPartyNewRound);}
+          AudioPlayback.PlaySound(SoundLib.Start);
+          FadeTo(@ScreenPartyNewRound);
         end;
 
       // Up and Down could be done at the same time,
@@ -272,8 +274,6 @@ begin
 end;
 
 constructor TScreenPartyPlayer.Create;
-//var
-// I:    integer; // Auto Removed, Unused Variable
 begin
   inherited Create;
 
@@ -321,9 +321,9 @@ 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[0].Visible := true;
     Button[1].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=1);
     Button[2].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=2);
     Button[3].Visible := (PartySession.Teams.Teaminfo[0].NumPlayers >=3);
@@ -331,16 +331,16 @@ begin
   end
   else
   begin
-    Button[0].Visible := False;
-    Button[1].Visible := False;
-    Button[2].Visible := False;
-    Button[3].Visible := False;
-    Button[4].Visible := False;
+    Button[0].Visible := false;
+    Button[1].Visible := false;
+    Button[2].Visible := false;
+    Button[3].Visible := false;
+    Button[4].Visible := false;
   end;
 
-  If (PartySession.Teams.NumTeams>=2) then
+  if (PartySession.Teams.NumTeams>=2) then
   begin
-    Button[5].Visible := True;
+    Button[5].Visible := true;
     Button[6].Visible := (PartySession.Teams.Teaminfo[1].NumPlayers >=1);
     Button[7].Visible := (PartySession.Teams.Teaminfo[1].NumPlayers >=2);
     Button[8].Visible := (PartySession.Teams.Teaminfo[1].NumPlayers >=3);
@@ -348,16 +348,16 @@ begin
   end
   else
   begin
-    Button[5].Visible := False;
-    Button[6].Visible := False;
-    Button[7].Visible := False;
-    Button[8].Visible := False;
-    Button[9].Visible := False;
+    Button[5].Visible := false;
+    Button[6].Visible := false;
+    Button[7].Visible := false;
+    Button[8].Visible := false;
+    Button[9].Visible := false;
   end;
 
-  If (PartySession.Teams.NumTeams>=3) then
+  if (PartySession.Teams.NumTeams>=3) then
   begin
-    Button[10].Visible := True;
+    Button[10].Visible := true;
     Button[11].Visible := (PartySession.Teams.Teaminfo[2].NumPlayers >=1);
     Button[12].Visible := (PartySession.Teams.Teaminfo[2].NumPlayers >=2);
     Button[13].Visible := (PartySession.Teams.Teaminfo[2].NumPlayers >=3);
@@ -365,12 +365,12 @@ begin
   end
   else
   begin
-    Button[10].Visible := False;
-    Button[11].Visible := False;
-    Button[12].Visible := False;
-    Button[13].Visible := False;
-    Button[14].Visible := False;
-  end;   }
+    Button[10].Visible := false;
+    Button[11].Visible := false;
+    Button[12].Visible := false;
+    Button[13].Visible := false;
+    Button[14].Visible := false;
+  end;
 
 end;
 
-- 
cgit v1.2.3