merged unicode branch (r1931) into trunk

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

1 files changed, 16 insertions, 15 deletions

diff --git a/src/screens/UScreenPartyNewRound.pas b/src/screens/UScreenPartyNewRound.pas
index 03a72fa9..c4295502 100644
--- a/src/screens/UScreenPartyNewRound.pas
+++ b/src/screens/UScreenPartyNewRound.pas
@@ -34,12 +34,12 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu,
   SDL,
+  SysUtils,
+  UMenu,
   UDisplay,
   UMusic,
   UFiles,
-  SysUtils,
   UThemes;
 
 type
@@ -99,8 +99,8 @@ type
 
 
       constructor Create; override;
-      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
-      procedure onShow; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure OnShow; override;
       procedure SetAnimationProgress(Progress: real); override;
   end;
 
@@ -115,16 +115,17 @@ uses
   UDLLManager,
   ULanguage,
   USong,
-  ULog;
+  ULog,
+  UUnicodeUtils;
 
-function TScreenPartyNewRound.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;
+function TScreenPartyNewRound.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
     // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
-      'Q':
+    case UCS4UpperCase(CharCode) of
+      Ord('Q'):
         begin
           Result := false;
           Exit;
@@ -215,12 +216,12 @@ begin
   LoadFromTheme(Theme.PartyNewRound);
 end;
 
-procedure TScreenPartyNewRound.onShow;
+procedure TScreenPartyNewRound.OnShow;
 var
   I: integer;
-  function GetTeamPlayers(const Num: byte): string;
+  function GetTeamPlayers(const Num: byte): UTF8String;
   var
-    Players: array of string;
+    Players: array of UTF8String;
     J: byte;
   begin
     if (Num-1 >= PartySession.Teams.NumTeams) then
@@ -229,7 +230,7 @@ var
     //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] := UTF8String(PartySession.Teams.TeamInfo[Num-1].PlayerInfo[J].Name);
 
     //Implode and Return
     Result := Language.Implode(Players);
@@ -364,7 +365,7 @@ begin
   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);
+    Text[TextNameTeam1].Text := UTF8String(PartySession.Teams.TeamInfo[0].Name);
     Text[TextTeam1Players].Text := GetTeamPlayers(1);
 
     Text[TextScoreTeam1].Visible := true;
@@ -385,7 +386,7 @@ begin
   if (PartySession.Teams.NumTeams >= 2) then
   begin
     Text[TextScoreTeam2].Text := InttoStr(PartySession.Teams.TeamInfo[1].Score);
-    Text[TextNameTeam2].Text := string(PartySession.Teams.TeamInfo[1].Name);
+    Text[TextNameTeam2].Text := UTF8String(PartySession.Teams.TeamInfo[1].Name);
     Text[TextTeam2Players].Text := GetTeamPlayers(2);
 
     Text[TextScoreTeam2].Visible := true;
@@ -406,7 +407,7 @@ begin
   if (PartySession.Teams.NumTeams >= 3) then
   begin
     Text[TextScoreTeam3].Text := InttoStr(PartySession.Teams.TeamInfo[2].Score);
-    Text[TextNameTeam3].Text := string(PartySession.Teams.TeamInfo[2].Name);
+    Text[TextNameTeam3].Text := UTF8String(PartySession.Teams.TeamInfo[2].Name);
     Text[TextTeam3Players].Text := GetTeamPlayers(3);
 
     Text[TextScoreTeam3].Visible := true;