diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/scumm/vars.cpp | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/scumm/vars.cpp')
| -rw-r--r-- | engines/scumm/vars.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 26a6a2f3b1..6d132c601f 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; @@ -546,7 +546,7 @@ void ScummEngine_v8::setupScummVars() { #endif void ScummEngine_v0::resetScummVars() { - resetSentence(false); + resetSentence(); VAR(VAR_EGO) = 3; |