aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v1.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-11-07 15:06:25 +0000
committerJohannes Schickel2009-11-07 15:06:25 +0000
commit0d79ace422cee533bc852b4d52e22829f1a61947 (patch)
treec852b99eba847a4b14a4bfe3acfca95f4033c0cc /engines/kyra/kyra_v1.cpp
parent373b5d10136e2ee497b2bec2ff4c3799029dd3cc (diff)
downloadscummvm-rg350-0d79ace422cee533bc852b4d52e22829f1a61947.tar.gz
scummvm-rg350-0d79ace422cee533bc852b4d52e22829f1a61947.tar.bz2
scummvm-rg350-0d79ace422cee533bc852b4d52e22829f1a61947.zip
Access _keyMap a little different, so that no additional entries are created, when an unmapped key is pressed.
svn-id: r45730
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
-rw-r--r--engines/kyra/kyra_v1.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 37def456c7..875f4a6ba5 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -282,7 +282,11 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
quitGame();
}
} else {
- keys = _keyMap[event.kbd.keycode];
+ KeyMap::const_iterator keycode = _keyMap.find(event.kbd.keycode);
+ if (keycode != _keyMap.end())
+ keys = keycode->_value;
+ else
+ keys = 0;
// When we got an keypress, which we might need to handle,
// break the event loop and pass it to GUI code.