- WideStringUpperCase moved to UUnicodeUtils.pas

- WideCharUpperCase removed as single characters (code-point) can be represented by two WideChars (surrogates). Convert to UCS4 instead (one code-point <-> one UCS4Char).
- UCS4 functions added to UUUnicodeUtils
- string replaced with UTF8String (although it's just a typedef) to mark UTF8 strings.

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

1 files changed, 20 insertions, 12 deletions

diff --git a/unicode/src/screens/UScreenPartyNewRound.pas b/unicode/src/screens/UScreenPartyNewRound.pas
index 01de9df7..1b83b6e4 100644
--- a/unicode/src/screens/UScreenPartyNewRound.pas
+++ b/unicode/src/screens/UScreenPartyNewRound.pas
@@ -34,7 +34,13 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu, SDL, UDisplay, UMusic, UFiles, SysUtils, UThemes;
+  SDL,
+  SysUtils,
+  UMenu,
+  UDisplay,
+  UMusic,
+  UFiles,
+  UThemes;
 
 type
   TScreenPartyNewRound = class(TMenu)
@@ -101,15 +107,17 @@ type
 
 implementation
 
-uses UGraphic,
-     UMain,
-     UIni,
-     UTexture,
-     UParty,
-     UDLLManager,
-     ULanguage,
-     USong,
-     ULog;
+uses
+  UGraphic,
+  UMain,
+  UIni,
+  UTexture,
+  UParty,
+  UDLLManager,
+  ULanguage,
+  USong,
+  ULog,
+  UUnicodeUtils;
 
 function TScreenPartyNewRound.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
 begin
@@ -117,7 +125,7 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
+    case WideStringUpperCase(CharCode)[1] of
       'Q':
         begin
           Result := false;
@@ -214,7 +222,7 @@ var
   I: Integer;
   function GetTeamPlayers(const Num: Byte): String;
   var
-    Players: Array of String;
+    Players: array of UTF8String;
     //J: Byte;
   begin            // to-do : Party
     if (Num-1 >= {PartySession.Teams.NumTeams}0) then