Fixed compilation on the mac.

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

26 files changed, 149 insertions, 150 deletions

diff --git a/Game/Code/Screens/UScreenEdit.pas b/Game/Code/Screens/UScreenEdit.pas
index 4d105e5f..492191ee 100644
--- a/Game/Code/Screens/UScreenEdit.pas
+++ b/Game/Code/Screens/UScreenEdit.pas
@@ -30,8 +30,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index d50d546d..a45e8458 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -109,13 +109,13 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
 
     // check special keys
     case PressedKey of
diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas
index 3b29564a..f0e0a7b7 100644
--- a/Game/Code/Screens/UScreenEditHeader.pas
+++ b/Game/Code/Screens/UScreenEditHeader.pas
@@ -59,8 +59,8 @@ begin
   Result := true;

   If (PressedDown) Then begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index c75661fc..1fb7bff8 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -119,13 +119,13 @@ begin
 
   If (PressedDown) then begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-      'S':

+        begin
+          Result := false;
+          Exit;
+        end;
+      'S':
         begin
           // Save Song
           if SDL_ModState = KMOD_LSHIFT then
@@ -181,7 +181,7 @@ begin
             CopySentence(CopySrc, Lines[0].Current);
           end;
         end;
-      'T':

+      'T':
         begin
           // Fixes timings between sentences
           FixTimings;
@@ -232,7 +232,7 @@ begin
           end;
           Exit;
         end;
-      // Golden Note Patch

+      // Golden Note Patch
       'G':
         begin
           case Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType of
@@ -260,9 +260,9 @@ begin
           end; // case
           Exit;
         end;
-    end;

-    

-    // check special keys

+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas
index 144ec697..1ea79e7f 100644
--- a/Game/Code/Screens/UScreenLevel.pas
+++ b/Game/Code/Screens/UScreenLevel.pas
@@ -30,15 +30,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index 2d13ac09..108f811c 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -56,8 +56,7 @@ uses
 
 function TScreenMain.ParseInput(PressedKey: Cardinal; CharCode: WideChar; PressedDown: Boolean): Boolean;
 var
-I: Integer;
-SDL_ModState:  Word;
+	SDL_ModState:  Word;
 begin
   Result := true;
 
@@ -74,7 +73,7 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of
+    case WideCharUpperCase(CharCode)[1] of
       'Q':
         begin
           Result := false;
diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas
index cfb0c977..3f936602 100644
--- a/Game/Code/Screens/UScreenOptions.pas
+++ b/Game/Code/Screens/UScreenOptions.pas
@@ -29,15 +29,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index c23f133c..adf4125d 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -25,15 +25,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas
index 40200c60..428b2ff7 100644
--- a/Game/Code/Screens/UScreenOptionsGame.pas
+++ b/Game/Code/Screens/UScreenOptionsGame.pas
@@ -27,15 +27,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index 04656e97..0a736a9d 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -25,8 +25,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index 50b7d53d..a314f2f3 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -25,8 +25,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index 0ba554c4..6ee200fa 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -78,8 +78,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas
index 70d92fa5..3cbc65a5 100644
--- a/Game/Code/Screens/UScreenOptionsSound.pas
+++ b/Game/Code/Screens/UScreenOptionsSound.pas
@@ -25,15 +25,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index c50256a2..743f5fda 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -39,15 +39,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index e7e2c682..057344dc 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -92,13 +92,13 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
 
     // check special keys
     case PressedKey of
diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index c0dde4cc..bd05e653 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -57,13 +57,13 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
 
     // check special keys
     case PressedKey of
@@ -80,13 +80,13 @@ begin
           If (Playlist = 2) and (Length(PlaylistMan.Playlists) = 0) then
             Exit;
           // Don't start when SinglePlayer Teams but only Multiplayer Plugins available
-          OnlyMultiPlayer:=true;

-          for I := 0 to High(DLLMan.Plugins) do begin

-            OnlyMultiPlayer := (OnlyMultiPlayer AND DLLMan.Plugins[I].TeamModeOnly);

-          end;

-          if (OnlyMultiPlayer) AND ((NumPlayer1 = 0) OR (NumPlayer2 = 0) OR ((NumPlayer3 = 0) AND (NumTeams = 1))) then begin

-            ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));

-            Exit;

+          OnlyMultiPlayer:=true;
+          for I := 0 to High(DLLMan.Plugins) do begin
+            OnlyMultiPlayer := (OnlyMultiPlayer AND DLLMan.Plugins[I].TeamModeOnly);
+          end;
+          if (OnlyMultiPlayer) AND ((NumPlayer1 = 0) OR (NumPlayer2 = 0) OR ((NumPlayer3 = 0) AND (NumTeams = 1))) then begin
+            ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));
+            Exit;
           end;
           //Save Difficulty
           Ini.Difficulty := SelectsS[SelectLevel].SelectedOption;
diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 26e53fcf..c1a84ee6 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -50,15 +50,15 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

         end;

     end;

-
-    // check special keys
+

+    // check special keys

     case PressedKey of

       SDLK_ESCAPE,

       SDLK_BACKSPACE :

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index 02079b34..002c6f75 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -43,13 +43,13 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
 
     // check special keys
     case PressedKey of
diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index c4541050..328e9851 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -49,15 +49,15 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

         end;

     end;

-
-    // check special keys
+

+    // check special keys

     case PressedKey of

       SDLK_ESCAPE,

       SDLK_BACKSPACE :

diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index 358c18d8..23ff86a5 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -150,15 +150,15 @@ begin
   Result := true;

   If (PressedDown) Then begin

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

         end;

     end;

-
-    // check special keys
+

+    // check special keys

     case PressedKey of

       SDLK_ESCAPE,

       SDLK_BACKSPACE :

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 6d05c145..bc6c0966 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -135,9 +135,9 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

+        begin
           //When not ask before Exit then Finish now
           if (Ini.AskbeforeDel <> 1) then
             Finish
@@ -148,7 +148,7 @@ begin
           Result := false;
           Exit;
         end;
-      'V': //Show Visualization

+      'V': //Show Visualization
         begin
           fShowVisualization := not fShowVisualization;
 
@@ -162,12 +162,12 @@ begin
 
           Exit;  
         end;
-      'P':

+      'P':
         begin
           Pause;
           Exit;
         end;
-    end;

+    end;
 
     // check special keys
     case PressedKey of
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index a1cd8748..a3467bfe 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -256,9 +256,9 @@ begin
     //Jump to Artist/Titel

     if ((SDL_ModState and KMOD_LALT <> 0) AND (Mode = smNormal)) then

     begin

-      if (WideUpperCase(CharCode)[1] in ['A'..'Z']) then

+      if (WideCharUpperCase(CharCode)[1] in ['A'..'Z']) then

       begin

-        Letter := WideUpperCase(CharCode)[1];

+        Letter := WideCharUpperCase(CharCode)[1];

         I2 := Length(CatSongs.Song);

 

         //Jump To Titel

@@ -310,8 +310,8 @@ begin
     end;

 

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 9cbb1be9..edd3fabb 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -69,10 +69,10 @@ begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
-    if (CurMenu = SM_Playlist_New) AND (Interaction=0) then

+    if (CurMenu = SM_Playlist_New) AND (Interaction=0) then
     begin
       // check normal keys
-      case WideUpperCase(CharCode)[1] of
+      case WideCharUpperCase(CharCode)[1] of
         '0'..'9', 'A'..'Z', ' ', '-', '_', '!', ',', '<', '/', '*', '?', '''', '"':
           begin
             Button[Interaction].Text[0].Text := Button[Interaction].Text[0].Text + CharCode;
@@ -91,13 +91,13 @@ begin
     end;
 
     // check normal keys
-    case WideUpperCase(CharCode)[1] of
+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
 
     // check special keys
     case PressedKey of
diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas
index 14f4808e..c5c8245f 100644
--- a/Game/Code/Screens/UScreenStatDetail.pas
+++ b/Game/Code/Screens/UScreenStatDetail.pas
@@ -45,8 +45,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     // check normal keys

-    case WideUpperCase(CharCode)[1] of

-      'Q':
+    case WideCharUpperCase(CharCode)[1] of

+      'Q':

         begin

           Result := false;

           Exit;

diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas
index 87bd1b5f..fc0a46b8 100644
--- a/Game/Code/Screens/UScreenStatMain.pas
+++ b/Game/Code/Screens/UScreenStatMain.pas
@@ -53,15 +53,15 @@ begin
   If (PressedDown) Then
   begin // Key Down
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE :
diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas
index 8ebb056c..6893391c 100644
--- a/Game/Code/Screens/UScreenTop5.pas
+++ b/Game/Code/Screens/UScreenTop5.pas
@@ -38,15 +38,15 @@ begin
   Result := true;
   If (PressedDown) Then begin
     // check normal keys
-    case WideUpperCase(CharCode)[1] of

+    case WideCharUpperCase(CharCode)[1] of
       'Q':
-        begin

-          Result := false;

-          Exit;

-        end;

-    end;

-    

-    // check special keys

+        begin
+          Result := false;
+          Exit;
+        end;
+    end;
+    
+    // check special keys
     case PressedKey of
       SDLK_ESCAPE,
       SDLK_BACKSPACE,