diff options
| author | Colin Snover | 2017-07-22 15:48:17 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-07-23 10:35:13 -0500 |
| commit | 6b87b13ab1ead1115cce6a897ee78c4eba45d76d (patch) | |
| tree | d5de5258413635ead5f58a21e24f1c7ed02a52a5 | |
| parent | 3d92f05261fbbfbb491ed855ed06167ab94ad3d3 (diff) | |
| download | scummvm-rg350-6b87b13ab1ead1115cce6a897ee78c4eba45d76d.tar.gz scummvm-rg350-6b87b13ab1ead1115cce6a897ee78c4eba45d76d.tar.bz2 scummvm-rg350-6b87b13ab1ead1115cce6a897ee78c4eba45d76d.zip | |
SCI: Minor cleanups in kGetEvent
| -rw-r--r-- | engines/sci/engine/kevent.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index 85665cde7f..735382ca3e 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -72,7 +72,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { writeSelectorValue(segMan, obj, SELECTOR(x), mousePos.x); writeSelectorValue(segMan, obj, SELECTOR(y), mousePos.y); g_debug_simulated_key = 0; - return make_reg(0, 1); + return TRUE_REG; } curEvent = g_sci->getEventManager()->getSciEvent(mask); @@ -183,11 +183,10 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { case SCI_EVENT_KEYBOARD: writeSelectorValue(segMan, obj, SELECTOR(type), SCI_EVENT_KEYBOARD); // Keyboard event - s->r_acc = make_reg(0, 1); - writeSelectorValue(segMan, obj, SELECTOR(message), curEvent.character); // We only care about the translated character writeSelectorValue(segMan, obj, SELECTOR(modifiers), modifiers); + s->r_acc = TRUE_REG; break; case SCI_EVENT_MOUSE_RELEASE: @@ -202,7 +201,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) { writeSelectorValue(segMan, obj, SELECTOR(type), curEvent.type); writeSelectorValue(segMan, obj, SELECTOR(message), 0); writeSelectorValue(segMan, obj, SELECTOR(modifiers), modifiers); - s->r_acc = make_reg(0, 1); + s->r_acc = TRUE_REG; } break; |