From 9f62b7ba60b594352740a67a69724dcd8a39c298 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 14:49:52 +0000
Subject: some merge fixes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1856 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/menu/UMenu.pas                | 8 ++++----
 unicode/src/screens/UScreenScore.pas      | 2 +-
 unicode/src/screens/UScreenSingModi.pas   | 2 +-
 unicode/src/screens/UScreenSong.pas       | 8 ++++----
 unicode/src/screens/UScreenSongJumpto.pas | 1 -
 unicode/src/screens/UScreenTop5.pas       | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'unicode')

diff --git a/unicode/src/menu/UMenu.pas b/unicode/src/menu/UMenu.pas
index 7cdaef36..0c6ebc63 100644
--- a/unicode/src/menu/UMenu.pas
+++ b/unicode/src/menu/UMenu.pas
@@ -1616,7 +1616,7 @@ begin
   if RightMbESC and (MouseButton = SDL_BUTTON_RIGHT) and BtnDown then
   begin
     //if RightMbESC is set, send ESC keypress
-    Result:=ParseInput(SDLK_ESCAPE, #0, true);
+    Result:=ParseInput(SDLK_ESCAPE, 0, true);
   end;
 
   nBut := InteractAt(X, Y);
@@ -1628,18 +1628,18 @@ begin
     if (MouseButton = SDL_BUTTON_LEFT) and BtnDown then
     begin
       //click button
-      Result:=ParseInput(SDLK_RETURN, #0, true);
+      Result:=ParseInput(SDLK_RETURN, 0, true);
     end;
     if (Interactions[nBut].Typ = iSelectS) then
     begin
       //forward/backward in select slide with mousewheel
       if (MouseButton = SDL_BUTTON_WHEELDOWN) and BtnDown then
       begin
-        ParseInput(SDLK_RIGHT, #0, true);
+        ParseInput(SDLK_RIGHT, 0, true);
       end;
       if (MouseButton = SDL_BUTTON_WHEELUP) and BtnDown then
       begin
-        ParseInput(SDLK_LEFT, #0, true);
+        ParseInput(SDLK_LEFT, 0, true);
       end;
     end;
   end
diff --git a/unicode/src/screens/UScreenScore.pas b/unicode/src/screens/UScreenScore.pas
index c337e5a5..e07d0b9e 100644
--- a/unicode/src/screens/UScreenScore.pas
+++ b/unicode/src/screens/UScreenScore.pas
@@ -199,7 +199,7 @@ begin
   Result := True;
   if (MouseButton = SDL_BUTTON_LEFT) and BtnDown then begin
     //left-click anywhere sends return
-    ParseInput(SDLK_RETURN, #0, true);
+    ParseInput(SDLK_RETURN, 0, true);
   end;
 end;
 
diff --git a/unicode/src/screens/UScreenSingModi.pas b/unicode/src/screens/UScreenSingModi.pas
index fbebe1ec..3ae5b7dc 100644
--- a/unicode/src/screens/UScreenSingModi.pas
+++ b/unicode/src/screens/UScreenSingModi.pas
@@ -64,7 +64,7 @@ type
       constructor Create; override;
       procedure onShow; override;
       //procedure onShowFinish; override;
-      function ParseInput(PressedKey: cCardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure Finish; override;
   end;
diff --git a/unicode/src/screens/UScreenSong.pas b/unicode/src/screens/UScreenSong.pas
index 5d9d730c..00d90930 100644
--- a/unicode/src/screens/UScreenSong.pas
+++ b/unicode/src/screens/UScreenSong.pas
@@ -753,18 +753,18 @@ begin
 
   if RightMbESC and (MouseButton = SDL_BUTTON_RIGHT) and BtnDown then
     //if RightMbESC is set, send ESC keypress
-    Result:=ParseInput(SDLK_ESCAPE, #0, true);
+    Result:=ParseInput(SDLK_ESCAPE, 0, true);
 
   //song scrolling with mousewheel
   if (MouseButton = SDL_BUTTON_WHEELDOWN) and BtnDown then
-    ParseInput(SDLK_RIGHT, #0, true);
+    ParseInput(SDLK_RIGHT, 0, true);
 
   if (MouseButton = SDL_BUTTON_WHEELUP) and BtnDown then
-    ParseInput(SDLK_LEFT, #0, true);
+    ParseInput(SDLK_LEFT, 0, true);
 
   //LMB anywhere starts
   if (MouseButton = SDL_BUTTON_LEFT) and BtnDown then
-    ParseInput(SDLK_RETURN, #0, true);
+    ParseInput(SDLK_RETURN, 0, true);
 end;
 
 constructor TScreenSong.Create;
diff --git a/unicode/src/screens/UScreenSongJumpto.pas b/unicode/src/screens/UScreenSongJumpto.pas
index 87b31106..256986fd 100644
--- a/unicode/src/screens/UScreenSongJumpto.pas
+++ b/unicode/src/screens/UScreenSongJumpto.pas
@@ -76,7 +76,6 @@ uses
   UTexture,
   ULanguage,
   UParty,
-  USongs,
   UScreenSong,
   ULog,
   UUnicodeUtils;
diff --git a/unicode/src/screens/UScreenTop5.pas b/unicode/src/screens/UScreenTop5.pas
index 2ddca8ef..48b2b54c 100644
--- a/unicode/src/screens/UScreenTop5.pas
+++ b/unicode/src/screens/UScreenTop5.pas
@@ -113,7 +113,7 @@ begin
   Result := true;
   if (MouseButton = SDL_BUTTON_LEFT) and BtnDown then
     //left-click anywhere sends return
-    ParseInput(SDLK_RETURN, #0, true);
+    ParseInput(SDLK_RETURN, 0, true);
 end;
 
 constructor TScreenTop5.Create;
-- 
cgit v1.2.3