aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kevent.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-17 13:21:19 +0000
committerMax Horn2009-09-17 13:21:19 +0000
commitb2c386ed000bce9a34a3d392b57a5d9abe8dfa7e (patch)
tree758e42e9b29478e0ddd79d2031788956643edf1c /engines/sci/engine/kevent.cpp
parentd861f5c854fb47e7f0a15a70738ab24f04c8036c (diff)
downloadscummvm-rg350-b2c386ed000bce9a34a3d392b57a5d9abe8dfa7e.tar.gz
scummvm-rg350-b2c386ed000bce9a34a3d392b57a5d9abe8dfa7e.tar.bz2
scummvm-rg350-b2c386ed000bce9a34a3d392b57a5d9abe8dfa7e.zip
SCI: Move parts of struct ScriptState into a new struct DebugState
svn-id: r44151
Diffstat (limited to 'engines/sci/engine/kevent.cpp')
-rw-r--r--engines/sci/engine/kevent.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index dc8ee6d296..44d49002ac 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -74,12 +74,12 @@ reg_t kGetEvent(EngineState *s, int, int argc, reg_t *argv) {
case SCI_EVT_KEYBOARD:
if ((e.buckybits & SCI_EVM_LSHIFT) && (e.buckybits & SCI_EVM_RSHIFT) && (e.data == '-')) {
printf("Debug mode activated\n");
- scriptState.seeking = kDebugSeekNothing;
- scriptState.runningStep = 0;
+ g_debugState.seeking = kDebugSeekNothing;
+ g_debugState.runningStep = 0;
} else if ((e.buckybits & SCI_EVM_CTRL) && (e.data == '`')) {
printf("Debug mode activated\n");
- scriptState.seeking = kDebugSeekNothing;
- scriptState.runningStep = 0;
+ g_debugState.seeking = kDebugSeekNothing;
+ g_debugState.runningStep = 0;
} else {
PUT_SEL32V(obj, type, SCI_EVT_KEYBOARD); // Keyboard event
s->r_acc = make_reg(0, 1);
@@ -123,8 +123,8 @@ reg_t kGetEvent(EngineState *s, int, int argc, reg_t *argv) {
s->r_acc = NULL_REG; // Unknown or no event
}
- if ((s->r_acc.offset) && (scriptState.stopOnEvent)) {
- scriptState.stopOnEvent = false;
+ if ((s->r_acc.offset) && (g_debugState.stopOnEvent)) {
+ g_debugState.stopOnEvent = false;
// A SCI event occured, and we have been asked to stop, so open the debug console
Console *con = ((Sci::SciEngine*)g_engine)->getSciDebugger();