diff options
| author | Martin Kiewitz | 2009-12-04 18:02:48 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-12-04 18:02:48 +0000 |
| commit | 3db191275955ce6bf912a96edf39b2a38b9e4c77 (patch) | |
| tree | 63cbd48f56d90f0f4e7c3c6814b757ae9d38e2f2 /engines/sci/engine | |
| parent | d982d1050585449a3c966161d2bde5ef46069895 (diff) | |
| download | scummvm-rg350-3db191275955ce6bf912a96edf39b2a38b9e4c77.tar.gz scummvm-rg350-3db191275955ce6bf912a96edf39b2a38b9e4c77.tar.bz2 scummvm-rg350-3db191275955ce6bf912a96edf39b2a38b9e4c77.zip | |
SCI: Renamed "buckybits" to "modifiers" in SciEvent
svn-id: r46256
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kevent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index 2ca8e13ab8..02e1961d80 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -75,11 +75,11 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { break; case SCI_EVENT_KEYBOARD: - if ((curEvent.buckybits & SCI_KEYMOD_LSHIFT) && (curEvent.buckybits & SCI_KEYMOD_RSHIFT) && (curEvent.data == '-')) { + 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.buckybits & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) { + } else if ((curEvent.modifiers & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) { printf("Debug mode activated\n"); g_debugState.seeking = kDebugSeekNothing; g_debugState.runningStep = 0; @@ -89,7 +89,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { PUT_SEL32V(segMan, obj, message, curEvent.character); // We only care about the translated character - PUT_SEL32V(segMan, obj, modifiers, curEvent.buckybits&modifier_mask); + PUT_SEL32V(segMan, obj, modifiers, curEvent.modifiers & modifier_mask); } break; @@ -117,7 +117,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { PUT_SEL32V(segMan, obj, type, curEvent.type); PUT_SEL32V(segMan, obj, message, 0); - PUT_SEL32V(segMan, obj, modifiers, (curEvent.buckybits | extra_bits)&modifier_mask); + PUT_SEL32V(segMan, obj, modifiers, (curEvent.modifiers | extra_bits) & modifier_mask); s->r_acc = make_reg(0, 1); } break; |