From 9f62b7ba60b594352740a67a69724dcd8a39c298 Mon Sep 17 00:00:00 2001 From: tobigun 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/screens/UScreenSong.pas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'unicode/src/screens/UScreenSong.pas') 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; -- cgit v1.2.3