diff options
| author | Tobias Gunkel | 2012-01-09 23:21:08 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:26 +0100 |
| commit | b337823bab5994b78f639a7625ff763f061a1c0c (patch) | |
| tree | f5521f8c799213c775d8eb580d0e8d6acef0bb85 /engines/scumm/vars.cpp | |
| parent | c16ef940a1f25846623903d6ce744374228ff104 (diff) | |
| download | scummvm-rg350-b337823bab5994b78f639a7625ff763f061a1c0c.tar.gz scummvm-rg350-b337823bab5994b78f639a7625ff763f061a1c0c.tar.bz2 scummvm-rg350-b337823bab5994b78f639a7625ff763f061a1c0c.zip | |
SCUMM: fix verb and script handling
- getVerbEntrypoint() should not handle walk-to differently (revert 0x0D handling back to original behavior)
- VAR_ACTIVE_ACTOR actually is VAR_ACTIVE_OBJECT2
- runSentenceScript(): "if (_cmdVerb == kVerbWalkTo)" must be "if (_cmdVerb != kVerbWalkTo)"
Diffstat (limited to 'engines/scumm/vars.cpp')
| -rw-r--r-- | engines/scumm/vars.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 26a6a2f3b1..6365a728d2 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -115,7 +115,7 @@ void ScummEngine_v0::setupScummVars() { VAR_CAMERA_POS_X = 2; VAR_HAVE_MSG = 3; VAR_ROOM = 4; - VAR_ACTIVE_ACTOR = 5; + VAR_ACTIVE_OBJECT2 = 5; VAR_OVERRIDE = 6; VAR_IS_SOUND_RUNNING = 8; VAR_ACTIVE_VERB = 9; |