diff options
| author | Martin Kiewitz | 2009-12-31 17:43:54 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-12-31 17:43:54 +0000 |
| commit | e56dedec3ff64ce21a2868b545d8e99ea5d21ee4 (patch) | |
| tree | af1f4094ab2ab33ff7a5f0ca3230b0ae81f36816 /engines/sci/engine | |
| parent | e53d82b28786f28ddb8761086c626d0672b41424 (diff) | |
| download | scummvm-rg350-e56dedec3ff64ce21a2868b545d8e99ea5d21ee4.tar.gz scummvm-rg350-e56dedec3ff64ce21a2868b545d8e99ea5d21ee4.tar.bz2 scummvm-rg350-e56dedec3ff64ce21a2868b545d8e99ea5d21ee4.zip | |
SCI: keyboard change cleanup, fixed Ctrl and Alt related keys on foreign keyboards as well
svn-id: r46803
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kevent.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index fbc0f71cad..e8f37ae535 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -75,22 +75,12 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { break; case SCI_EVENT_KEYBOARD: - if ((curEvent.modifiers & SCI_KEYMOD_LSHIFT) && (curEvent.modifiers & SCI_KEYMOD_RSHIFT) && (curEvent.data == '-')) { - printf("Debug mode activated\n"); - g_debugState.seeking = kDebugSeekNothing; - g_debugState.runningStep = 0; - } else if ((curEvent.modifiers & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) { - printf("Debug mode activated\n"); - g_debugState.seeking = kDebugSeekNothing; - g_debugState.runningStep = 0; - } else { - PUT_SEL32V(segMan, obj, type, SCI_EVENT_KEYBOARD); // Keyboard event - s->r_acc = make_reg(0, 1); + PUT_SEL32V(segMan, obj, type, SCI_EVENT_KEYBOARD); // Keyboard event + s->r_acc = make_reg(0, 1); - PUT_SEL32V(segMan, obj, message, curEvent.character); - // We only care about the translated character - PUT_SEL32V(segMan, obj, modifiers, curEvent.modifiers & modifier_mask); - } + PUT_SEL32V(segMan, obj, message, curEvent.character); + // We only care about the translated character + PUT_SEL32V(segMan, obj, modifiers, curEvent.modifiers & modifier_mask); break; case SCI_EVENT_MOUSE_RELEASE: |