[Scummvm-cvs-logs] SF.net SVN: scummvm:[43502] scummvm/branches/gsoc2009-16bit/backends/ keymapper

[upthorn at users.sourceforge.net]

Revision: 43502
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43502&view=rev
Author:   upthorn
Date:     2009-08-18 08:00:24 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Starting to simplify the Action structure, and rework it to facilitate making the automatic mapper smarter, at least when there is a keyboard present. Fixed a minor whitespace issue in a comment.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/backends/keymapper/action.cpp
    scummvm/branches/gsoc2009-16bit/backends/keymapper/action.h
    scummvm/branches/gsoc2009-16bit/backends/keymapper/keymap.cpp

Modified: scummvm/branches/gsoc2009-16bit/backends/keymapper/action.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/backends/keymapper/action.cpp	2009-08-18 06:54:09 UTC (rev 43501)
+++ scummvm/branches/gsoc2009-16bit/backends/keymapper/action.cpp	2009-08-18 08:00:24 UTC (rev 43502)
@@ -32,9 +32,9 @@
 namespace Common {
 
 Action::Action(Keymap *boss, const char *i,	String des, ActionType typ,
-			   KeyType prefKey, int pri, int flg)
+			   KeyType prefKey, int pri)
 	: _boss(boss), description(des), type(typ), preferredKey(prefKey),
-	priority(pri), flags(flg), _hwKey(0) {
+	priority(pri), _hwKey(0) {
 	assert(i);
 	assert(_boss);
 

Modified: scummvm/branches/gsoc2009-16bit/backends/keymapper/action.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/backends/keymapper/action.h	2009-08-18 06:54:09 UTC (rev 43501)
+++ scummvm/branches/gsoc2009-16bit/backends/keymapper/action.h	2009-08-18 08:00:24 UTC (rev 43502)
@@ -54,8 +54,6 @@
 	ActionType type;
 	KeyType preferredKey;
 	int priority;
-	int group;
-	int flags;
 
 private:
 	/** Hardware key that is mapped to this Action */
@@ -66,7 +64,7 @@
 	Action(Keymap *boss, const char *id, String des = "",
 		   ActionType typ = kGenericActionType,
 		   KeyType prefKey = kGenericKeyType,
-		   int pri = 0, int flg = 0 );
+		   int pri = 0);
 
 	void addEvent(const Event &evt) {
 		events.push_back(evt);

Modified: scummvm/branches/gsoc2009-16bit/backends/keymapper/keymap.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/backends/keymapper/keymap.cpp	2009-08-18 06:54:09 UTC (rev 43501)
+++ scummvm/branches/gsoc2009-16bit/backends/keymapper/keymap.cpp	2009-08-18 08:00:24 UTC (rev 43502)
@@ -240,7 +240,7 @@
 
 	// First mapping pass:
 	// - Match if a key's preferred action type is the same as the action's
-	// type, or vice versa.
+	//   type, or vice versa.
 	// - Priority is given to:
 	//     - keys that match action types over key types.
 	//     - keys that have not been used by parent maps.


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