aboutsummaryrefslogtreecommitdiff
path: root/scumm/dialogs.cpp
diff options
context:
space:
mode:
authorMax Horn2002-11-22 14:02:54 +0000
committerMax Horn2002-11-22 14:02:54 +0000
commit17cf386e8820fe312eb216c9be93d6d309f512e1 (patch)
tree2288df14ecb66e7637da7034ed9578323ef89bc2 /scumm/dialogs.cpp
parent6b2f898bdd67bdd37d0d65674dbc831a0b33aa0d (diff)
downloadscummvm-rg350-17cf386e8820fe312eb216c9be93d6d309f512e1.tar.gz
scummvm-rg350-17cf386e8820fe312eb216c9be93d6d309f512e1.tar.bz2
scummvm-rg350-17cf386e8820fe312eb216c9be93d6d309f512e1.zip
changed the key input system in NewGUI: pass both the keycode and the ascii value to handleKeyUp/Down. Also, use this to fix the key repeat code (see bug #626225)
svn-id: r5691
Diffstat (limited to 'scumm/dialogs.cpp')
-rw-r--r--scumm/dialogs.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 69616a4e9d..b2a252c8f8 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -752,13 +752,13 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
}
}
-void KeysDialog::handleKeyDown(char key, int modifiers) {
+void KeysDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
if (modifiers == 0xff && _get_key_mapping) {
// GAPI key was selected
char selection[100];
- clearActionKey(key & 0xff);
- getAction(_actionSelected)->action_key = (key & 0xff);
+ clearActionKey(ascii & 0xff);
+ getAction(_actionSelected)->action_key = (ascii & 0xff);
sprintf(selection, "Associated key : %s", getGAPIKeyName((unsigned int)getAction(_actionSelected)->action_key));
_actionTitle->setLabel(queryCustomString(25));
_keyMapping->setLabel(selection);