diff options
| author | Max Horn | 2010-11-28 17:43:10 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-28 17:43:10 +0000 |
| commit | beed05b0affcab40d4b54576bd264c8be799c2b6 (patch) | |
| tree | dd2a13acd64684d2367ea71f9f3e8a9c7ca8e057 | |
| parent | b63424960922ad6824c4efbcfdb08306934feb23 (diff) | |
| download | scummvm-rg350-beed05b0affcab40d4b54576bd264c8be799c2b6.tar.gz scummvm-rg350-beed05b0affcab40d4b54576bd264c8be799c2b6.tar.bz2 scummvm-rg350-beed05b0affcab40d4b54576bd264c8be799c2b6.zip | |
DINGUX: Correct compilation fix (I hope), remove dead code
svn-id: r54539
| -rw-r--r-- | backends/events/dinguxsdl/dinguxsdl-events.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp index 2def40b209..03e1663ca8 100644 --- a/backends/events/dinguxsdl/dinguxsdl-events.cpp +++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp @@ -25,11 +25,11 @@ #if defined(DINGUX) -#include "backends/events/dinguxsdl/dinguxsdl-events.h" - // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_EXCEPTION_FILE +#include "backends/events/dinguxsdl/dinguxsdl-events.h" + #define PAD_UP SDLK_UP #define PAD_DOWN SDLK_DOWN #define PAD_LEFT SDLK_LEFT @@ -43,23 +43,6 @@ #define TRIG_L SDLK_TAB #define TRIG_R SDLK_BACKSPACE -static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) { - if (key >= SDLK_F1 && key <= SDLK_F9) { - return key - SDLK_F1 + Common::ASCII_F1; - } else if (key >= SDLK_KP0 && key <= SDLK_KP9) { - return key - SDLK_KP0 + '0'; - } else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) { - return key; - } else if (unicode) { - return unicode; - } else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) { - return key & ~0x20; - } else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) { - return 0; - } - return key; -} - bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { if (ev.key.keysym.sym == PAD_UP) { if (ev.type == SDL_KEYDOWN) { |