[Scummvm-cvs-logs] scummvm master -> 1d3ff353730c26a3adba3599db70334630c1da94

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1d3ff35373 KEYMAPPER: Disable the (accidentally reenabled automatic mapper again


Commit: 1d3ff353730c26a3adba3599db70334630c1da94
    https://github.com/scummvm/scummvm/commit/1d3ff353730c26a3adba3599db70334630c1da94
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-29T14:12:45-08:00

Commit Message:
KEYMAPPER: Disable the (accidentally reenabled automatic mapper again

Changed paths:
    backends/keymapper/keymap.cpp



diff --git a/backends/keymapper/keymap.cpp b/backends/keymapper/keymap.cpp
index d64b888..6fc1b1e 100644
--- a/backends/keymapper/keymap.cpp
+++ b/backends/keymapper/keymap.cpp
@@ -199,7 +199,7 @@ bool Keymap::isComplete(const HardwareKeySet *hwKeys) {
 //     - if an action finds a key with required type but a parent action with
 //       higher priority is using it, that key is never used
 void Keymap::automaticMapping(HardwareKeySet *hwKeys) {
-#if 1 //disabling the broken automapper for now
+#if 0 //disabling the broken automapper for now
 	// Create copies of action and key lists.
 	List<Action*> actions(_actions);
 	List<const HardwareKey*> keys(hwKeys->getHardwareKeys());