[Scummvm-cvs-logs] SF.net SVN: scummvm:[54539] scummvm/trunk/backends/events/dinguxsdl/ dinguxsdl-events.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Nov 28 18:43:10 CET 2010


Revision: 54539
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54539&view=rev
Author:   fingolfin
Date:     2010-11-28 17:43:10 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
DINGUX: Correct compilation fix (I hope), remove dead code

Modified Paths:
--------------
    scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.cpp

Modified: scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.cpp
===================================================================
--- scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.cpp	2010-11-28 17:42:47 UTC (rev 54538)
+++ scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.cpp	2010-11-28 17:43:10 UTC (rev 54539)
@@ -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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list