aboutsummaryrefslogtreecommitdiff
path: root/backends/keymapper/keymapper.cpp
diff options
context:
space:
mode:
authorTarek Soliman2012-01-07 21:10:05 -0600
committerTarek Soliman2012-01-07 21:10:05 -0600
commit82e0900678ab755256e141e15dd58a99090388f1 (patch)
tree1f37acc0ae7d45365e3240c09a7cd5743c0c95f8 /backends/keymapper/keymapper.cpp
parent73160e54b43180b1fcc8f9de0a548e5817d0d1cd (diff)
downloadscummvm-rg350-82e0900678ab755256e141e15dd58a99090388f1.tar.gz
scummvm-rg350-82e0900678ab755256e141e15dd58a99090388f1.tar.bz2
scummvm-rg350-82e0900678ab755256e141e15dd58a99090388f1.zip
KEYMAPPER: Rename inherit flag to transparent
Less confusing
Diffstat (limited to 'backends/keymapper/keymapper.cpp')
-rw-r--r--backends/keymapper/keymapper.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp
index 025e917273..f950b1f4a2 100644
--- a/backends/keymapper/keymapper.cpp
+++ b/backends/keymapper/keymapper.cpp
@@ -143,7 +143,7 @@ Keymap *Keymapper::getKeymap(const String& name, bool *globalReturn) {
return keymap;
}
-bool Keymapper::pushKeymap(const String& name, bool inherit) {
+bool Keymapper::pushKeymap(const String& name, bool transparent) {
bool global;
Keymap *newMap = getKeymap(name, &global);
@@ -152,13 +152,13 @@ bool Keymapper::pushKeymap(const String& name, bool inherit) {
return false;
}
- pushKeymap(newMap, inherit, global);
+ pushKeymap(newMap, transparent, global);
return true;
}
-void Keymapper::pushKeymap(Keymap *newMap, bool inherit, bool global) {
- MapRecord mr = {newMap, inherit, global};
+void Keymapper::pushKeymap(Keymap *newMap, bool transparent, bool global) {
+ MapRecord mr = {newMap, transparent, global};
_activeMaps.push(mr);
}
@@ -198,7 +198,7 @@ bool Keymapper::mapKey(const KeyState& key, bool keyDown) {
debug(5, "Keymapper::mapKey keymap: %s", mr.keymap->getName().c_str());
action = mr.keymap->getMappedAction(key);
- if (action || !mr.inherit)
+ if (action || !mr.transparent)
break;
}