aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-19 09:46:04 +0000
committerMartin Kiewitz2010-06-19 09:46:04 +0000
commita7fa0649dfc71c79f496a86986413f35c8d36966 (patch)
tree550679e4c14e607949bdd47062ebbd57152e2cfb /engines/sci/engine
parent4fb3059edcfdcfc6ab64cd0c4437e1cbb289d00e (diff)
downloadscummvm-rg350-a7fa0649dfc71c79f496a86986413f35c8d36966.tar.gz
scummvm-rg350-a7fa0649dfc71c79f496a86986413f35c8d36966.tar.bz2
scummvm-rg350-a7fa0649dfc71c79f496a86986413f35c8d36966.zip
SCI: implemented checking of keyboard driver in case of SCI1EGA/EARLY, also renamed SCI_EVENT_JOYSTICK to SCI_EVENT_DIRECTION
svn-id: r50045
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kevent.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index f516a9d4b1..e38550adee 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -203,12 +203,10 @@ reg_t kMapKeyToDir(EngineState *s, int argc, reg_t *argv) {
}
if (mover >= 0) {
- // FIXME: changing point was actually inbetween SCI1EARLY, we need to find out when it happened
- // and then find some method of finding out those specific games
- if (getSciVersion() >= SCI_VERSION_1_MIDDLE)
- writeSelectorValue(segMan, obj, SELECTOR(type), SCI_EVENT_KEYBOARD | SCI_EVENT_JOYSTICK);
+ if (g_sci->getEventManager()->getUsesNewKeyboardDirectionType())
+ writeSelectorValue(segMan, obj, SELECTOR(type), SCI_EVENT_KEYBOARD | SCI_EVENT_DIRECTION);
else
- writeSelectorValue(segMan, obj, SELECTOR(type), SCI_EVENT_JOYSTICK);
+ writeSelectorValue(segMan, obj, SELECTOR(type), SCI_EVENT_DIRECTION);
writeSelectorValue(segMan, obj, SELECTOR(message), mover);
return make_reg(0, 1);
} else