diff options
| -rw-r--r-- | engines/scumm/object.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/verbs.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 49f1777c86..670b2cb79c 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -1223,7 +1223,7 @@ uint32 ScummEngine::getOBCDOffs(int object) const { return 0; for (i = (_numLocalObjects-1); i > 0; i--) { - if (_objs[i].obj_nr == object) { + if (_objs[i].obj_nr == OBJECT_V0_NR(object)) { if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object)) continue; if (_objs[i].fl_object_index != 0) diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp index 376e075daa..19ad003da6 100644 --- a/engines/scumm/verbs.cpp +++ b/engines/scumm/verbs.cpp @@ -740,6 +740,7 @@ void ScummEngine_v0::verbExec() { if (_activeVerb != kVerbWalkTo) { _activeVerb = kVerbWalkTo; _activeObjectNr = 0; + _activeObjectType = 0; } _walkToObjectIdx = 0; return; @@ -841,6 +842,7 @@ void ScummEngine_v0::checkExecVerbs() { _activeObjectNr = id; _activeObjectType = type; } + // immediately execute action in keypad/selection mode if (_currentMode == kModeKeypad) execute = true; } else { |