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 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'unicode/src/menu')

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
-- 
cgit v1.2.3