[Scummvm-cvs-logs] CVS: scummvm/backends/wince CEActions.h,1.2.2.1,1.2.2.2 CEActions.cpp,1.3.2.4,1.3.2.5

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15051

Modified Files:
      Tag: branch-0-6-0
	CEActions.h CEActions.cpp 
Log Message:
Cleanup action code ; fix Zoom Up /Zoom Down not mapped bug

Index: CEActions.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEActions.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- CEActions.h	15 Mar 2004 10:02:59 -0000	1.2.2.1
+++ CEActions.h	28 Mar 2004 21:47:24 -0000	1.2.2.2
@@ -32,8 +32,7 @@
 #include "Key.h"
 
 enum ActionType {
-        ACTION_NONE = 0,
-        ACTION_PAUSE,
+        ACTION_PAUSE = 0,
         ACTION_SAVE,
         ACTION_QUIT,
         ACTION_SKIP,
@@ -49,7 +48,7 @@
 		ACTION_LAST
 };
 
-#define ACTIONS_VERSION 2
+#define ACTIONS_VERSION 3
 
 class OSystem_WINCE3;
 

Index: CEActions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEActions.cpp,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- CEActions.cpp	15 Mar 2004 10:02:59 -0000	1.3.2.4
+++ CEActions.cpp	28 Mar 2004 21:47:24 -0000	1.3.2.5
@@ -31,7 +31,6 @@
 #include "common/config-manager.h"
 
 const String actionNames[] = { 
-	"none", 
 	"Pause", 
 	"Save", 
 	"Quit",
@@ -212,7 +211,7 @@
 	for (i=0; i<ACTION_LAST; i++) {
 		if (_action_mapping[i] == keyCode) {
 			if (pushed)
-				return perform((ActionType)(i + 1));
+				return perform((ActionType)i);
 			else
 				return true;
 		}
@@ -260,7 +259,7 @@
 }
 
 unsigned int CEActions::getMapping(ActionType action) {
-	return _action_mapping[action - 1];
+	return _action_mapping[action];
 }
 
 
@@ -272,7 +271,7 @@
 			_action_mapping[i] = 0;
 	}
 
-	_action_mapping[action - 1] = keyCode;
+	_action_mapping[action] = keyCode;
 }
 
 bool CEActions::needsRightClickMapping() {