diff options
author | Max Horn | 2009-11-10 00:01:43 +0000 |
---|---|---|
committer | Max Horn | 2009-11-10 00:01:43 +0000 |
commit | 885cbb53025e04a0cf5c414df07d3eb49ee79ffb (patch) | |
tree | 068c931fbe97761984e3d15d2b45a0f477795b9b /backends/platform/sdl | |
parent | 1f37da26263d137397f8787500d771dca0d460fe (diff) | |
download | scummvm-rg350-885cbb53025e04a0cf5c414df07d3eb49ee79ffb.tar.gz scummvm-rg350-885cbb53025e04a0cf5c414df07d3eb49ee79ffb.tar.bz2 scummvm-rg350-885cbb53025e04a0cf5c414df07d3eb49ee79ffb.zip |
SDL: Remove const from new handle*() method for now, to allow using remapKey (ultimately, the goal is to get back the const by changing how remapping works)
svn-id: r45797
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r-- | backends/platform/sdl/events.cpp | 18 | ||||
-rw-r--r-- | backends/platform/sdl/sdl.h | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp index 505d79000a..b7fe40adb7 100644 --- a/backends/platform/sdl/events.cpp +++ b/backends/platform/sdl/events.cpp @@ -191,7 +191,7 @@ bool OSystem_SDL::pollEvent(Common::Event &event) { return false; } -bool OSystem_SDL::dispatchSDLEvent(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) { switch (ev.type) { case SDL_KEYDOWN: return handleKeyDown(ev, event); @@ -224,7 +224,7 @@ bool OSystem_SDL::dispatchSDLEvent(const SDL_Event &ev, Common::Event &event) { } -bool OSystem_SDL::handleKeyDown(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleKeyDown(SDL_Event &ev, Common::Event &event) { byte b = 0; b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState()); @@ -313,7 +313,7 @@ bool OSystem_SDL::handleKeyDown(const SDL_Event &ev, Common::Event &event) { return true; } -bool OSystem_SDL::handleKeyUp(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleKeyUp(SDL_Event &ev, Common::Event &event) { byte b = 0; const bool event_complete = remapKey(ev, event); @@ -334,7 +334,7 @@ bool OSystem_SDL::handleKeyUp(const SDL_Event &ev, Common::Event &event) { return true; } -bool OSystem_SDL::handleMouseMotion(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleMouseMotion(SDL_Event &ev, Common::Event &event) { event.type = Common::EVENT_MOUSEMOVE; fillMouseEvent(event, ev.motion.x, ev.motion.y); @@ -342,7 +342,7 @@ bool OSystem_SDL::handleMouseMotion(const SDL_Event &ev, Common::Event &event) { return true; } -bool OSystem_SDL::handleMouseButtonDown(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) { if (ev.button.button == SDL_BUTTON_LEFT) event.type = Common::EVENT_LBUTTONDOWN; else if (ev.button.button == SDL_BUTTON_RIGHT) @@ -365,7 +365,7 @@ bool OSystem_SDL::handleMouseButtonDown(const SDL_Event &ev, Common::Event &even return true; } -bool OSystem_SDL::handleMouseButtonUp(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) { if (ev.button.button == SDL_BUTTON_LEFT) event.type = Common::EVENT_LBUTTONUP; else if (ev.button.button == SDL_BUTTON_RIGHT) @@ -381,7 +381,7 @@ bool OSystem_SDL::handleMouseButtonUp(const SDL_Event &ev, Common::Event &event) return true; } -bool OSystem_SDL::handleJoyButtonDown(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { if (ev.jbutton.button == JOY_BUT_LMOUSE) { event.type = Common::EVENT_LBUTTONDOWN; fillMouseEvent(event, _km.x, _km.y); @@ -412,7 +412,7 @@ bool OSystem_SDL::handleJoyButtonDown(const SDL_Event &ev, Common::Event &event) return true; } -bool OSystem_SDL::handleJoyButtonUp(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { if (ev.jbutton.button == JOY_BUT_LMOUSE) { event.type = Common::EVENT_LBUTTONUP; fillMouseEvent(event, _km.x, _km.y); @@ -443,7 +443,7 @@ bool OSystem_SDL::handleJoyButtonUp(const SDL_Event &ev, Common::Event &event) { return true; } -bool OSystem_SDL::handleJoyAxisMotion(const SDL_Event &ev, Common::Event &event) { +bool OSystem_SDL::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event) { int axis = ev.jaxis.value; if ( axis > JOY_DEADZONE) { axis -= JOY_DEADZONE; diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index f9849e34d1..7e1bf92473 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -157,20 +157,20 @@ public: virtual bool pollEvent(Common::Event &event); // overloaded by CE backend protected: - virtual bool dispatchSDLEvent(const SDL_Event &ev, Common::Event &event); + virtual bool dispatchSDLEvent(SDL_Event &ev, Common::Event &event); // Handlers for specific SDL events, called by pollEvent. // This way, if a backend inherits fromt the SDL backend, it can // change the behavior of only a single event, without having to override all // of pollEvent. - virtual bool handleKeyDown(const SDL_Event &ev, Common::Event &event); - virtual bool handleKeyUp(const SDL_Event &ev, Common::Event &event); - virtual bool handleMouseMotion(const SDL_Event &ev, Common::Event &event); - virtual bool handleMouseButtonDown(const SDL_Event &ev, Common::Event &event); - virtual bool handleMouseButtonUp(const SDL_Event &ev, Common::Event &event); - virtual bool handleJoyButtonDown(const SDL_Event &ev, Common::Event &event); - virtual bool handleJoyButtonUp(const SDL_Event &ev, Common::Event &event); - virtual bool handleJoyAxisMotion(const SDL_Event &ev, Common::Event &event); + virtual bool handleKeyDown(SDL_Event &ev, Common::Event &event); + virtual bool handleKeyUp(SDL_Event &ev, Common::Event &event); + virtual bool handleMouseMotion(SDL_Event &ev, Common::Event &event); + virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event); + virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event); + virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); + virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); + virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); public: |