aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl
diff options
context:
space:
mode:
authorMax Horn2009-11-09 23:58:12 +0000
committerMax Horn2009-11-09 23:58:12 +0000
commit1f37da26263d137397f8787500d771dca0d460fe (patch)
treee53817c7d7a7e7e8692c847ecd9681544b2abe6c /backends/platform/sdl
parentd6d2c5d7b83027c21f8e00d364c925ca5f45c392 (diff)
downloadscummvm-rg350-1f37da26263d137397f8787500d771dca0d460fe.tar.gz
scummvm-rg350-1f37da26263d137397f8787500d771dca0d460fe.tar.bz2
scummvm-rg350-1f37da26263d137397f8787500d771dca0d460fe.zip
Revert rev 45791 and make the first param of OSystem_SDL::remapKey again non-const (as it may have to be modified for remapping. Of course. Silly me :/)
svn-id: r45796
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r--backends/platform/sdl/events.cpp4
-rw-r--r--backends/platform/sdl/sdl.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index a20e0b4387..505d79000a 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -315,7 +315,7 @@ bool OSystem_SDL::handleKeyDown(const SDL_Event &ev, Common::Event &event) {
bool OSystem_SDL::handleKeyUp(const SDL_Event &ev, Common::Event &event) {
byte b = 0;
- const bool event_complete = remapKey(ev,event);
+ const bool event_complete = remapKey(ev, event);
if (event_complete)
return true;
@@ -491,7 +491,7 @@ bool OSystem_SDL::handleJoyAxisMotion(const SDL_Event &ev, Common::Event &event)
return true;
}
-bool OSystem_SDL::remapKey(const SDL_Event &ev, Common::Event &event) {
+bool OSystem_SDL::remapKey(SDL_Event &ev, Common::Event &event) {
#ifdef LINUPY
// On Yopy map the End button to quit
if ((ev.key.keysym.sym == 293)) {
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index e17cd5c086..f9849e34d1 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -486,7 +486,7 @@ protected:
void setupIcon();
void handleKbdMouse();
- virtual bool remapKey(const SDL_Event &ev, Common::Event &event);
+ virtual bool remapKey(SDL_Event &ev, Common::Event &event);
void handleScalerHotkeys(const SDL_KeyboardEvent &key);
};