diff options
| author | Tarek Soliman | 2011-12-30 13:03:39 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2011-12-30 13:03:39 -0600 |
| commit | 366a942a3a3dd9c3005c0f29d9e0b498eaf976ef (patch) | |
| tree | 6d7ed1063dd2d3465436c1347688ff25857b1d68 /backends/keymapper | |
| parent | 40b68b41c7a507dad5a1d38813bfa7f89e7c6551 (diff) | |
| download | scummvm-rg350-366a942a3a3dd9c3005c0f29d9e0b498eaf976ef.tar.gz scummvm-rg350-366a942a3a3dd9c3005c0f29d9e0b498eaf976ef.tar.bz2 scummvm-rg350-366a942a3a3dd9c3005c0f29d9e0b498eaf976ef.zip | |
KEYMAPPER: Simplify calling getKeymap
Diffstat (limited to 'backends/keymapper')
| -rw-r--r-- | backends/keymapper/keymapper.cpp | 9 | ||||
| -rw-r--r-- | backends/keymapper/keymapper.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 29f495cd53..025e917273 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -128,21 +128,24 @@ void Keymapper::cleanupGameKeymaps() { _activeMaps = newStack; } -Keymap *Keymapper::getKeymap(const String& name, bool &global) { +Keymap *Keymapper::getKeymap(const String& name, bool *globalReturn) { Keymap *keymap = _gameDomain.getKeymap(name); - global = false; + bool global = false; if (!keymap) { keymap = _globalDomain.getKeymap(name); global = true; } + if (globalReturn) + *globalReturn = global; + return keymap; } bool Keymapper::pushKeymap(const String& name, bool inherit) { bool global; - Keymap *newMap = getKeymap(name, global); + Keymap *newMap = getKeymap(name, &global); if (!newMap) { warning("Keymap '%s' not registered", name.c_str()); diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index c5a2558964..d38109f210 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -116,7 +116,7 @@ public: * @param name name of the keymap to return * @param global set to true if returned keymap is global, false if game */ - Keymap *getKeymap(const String& name, bool &global); + Keymap *getKeymap(const String& name, bool *global = 0); /** * Push a new keymap to the top of the active stack, activating |