diff options
| author | David-John Willis | 2011-03-01 15:00:07 +0000 |
|---|---|---|
| committer | David-John Willis | 2011-03-24 21:24:04 +0000 |
| commit | 973e3e827e39fc81a4b62490d3f1a60e5bc56518 (patch) | |
| tree | f30d3e6271da091851fee92e2378253192afcd60 | |
| parent | 19c407ca69ea2b98623203948bb62d84729645b3 (diff) | |
| download | scummvm-rg350-973e3e827e39fc81a4b62490d3f1a60e5bc56518.tar.gz scummvm-rg350-973e3e827e39fc81a4b62490d3f1a60e5bc56518.tar.bz2 scummvm-rg350-973e3e827e39fc81a4b62490d3f1a60e5bc56518.zip | |
GP2X: Remove incorrect GP2XWiz define from the GP2X event code.
* My plan is to move all of the GPH devices into the GPH backend
but for now this is just a merge mess from the GSoC-OpenGL branch.
| -rw-r--r-- | backends/events/gp2xsdl/gp2xsdl-events.cpp | 4 | ||||
| -rw-r--r-- | backends/events/gp2xsdl/gp2xsdl-events.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/events/gp2xsdl/gp2xsdl-events.cpp b/backends/events/gp2xsdl/gp2xsdl-events.cpp index 184f1d9b64..91feb2b447 100644 --- a/backends/events/gp2xsdl/gp2xsdl-events.cpp +++ b/backends/events/gp2xsdl/gp2xsdl-events.cpp @@ -25,7 +25,7 @@ #include "common/scummsys.h" -#if defined(GP2X) || defined(GP2XWIZ) +#if defined(GP2X) #include "backends/events/gp2xsdl/gp2xsdl-events.h" #if defined(GP2X) @@ -441,7 +441,7 @@ bool GP2XSdlEventSource::handleJoyAxisMotion(SDL_Event &ev, Common::Event &event _km.x_down_count = 0; } #endif - + } else if (ev.jaxis.axis == JOY_YAXIS) { #ifndef JOY_INVERT_Y axis = -axis; diff --git a/backends/events/gp2xsdl/gp2xsdl-events.h b/backends/events/gp2xsdl/gp2xsdl-events.h index 8ea533d052..5bf472d3d8 100644 --- a/backends/events/gp2xsdl/gp2xsdl-events.h +++ b/backends/events/gp2xsdl/gp2xsdl-events.h @@ -29,7 +29,7 @@ #include "backends/events/sdl/sdl-events.h" /** - * SDL events manager for GP2X and GP2XWIZ + * SDL events manager for GP2X */ class GP2XSdlEventSource : public SdlEventSource { public: |