diff options
| author | Travis Howell | 2009-07-25 06:27:41 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-25 06:27:41 +0000 |
| commit | c02ad3b7bfe5813c9bd86672ead37110d21d9bb5 (patch) | |
| tree | 28640b732810b3f603903ae42eb8fc99450b5f49 /engines/scumm/scumm.cpp | |
| parent | 41ef4938ac8cfcccba4d42c5e474a5a619d9db2b (diff) | |
| download | scummvm-rg350-c02ad3b7bfe5813c9bd86672ead37110d21d9bb5.tar.gz scummvm-rg350-c02ad3b7bfe5813c9bd86672ead37110d21d9bb5.tar.bz2 scummvm-rg350-c02ad3b7bfe5813c9bd86672ead37110d21d9bb5.zip | |
Add patch #2821100 - MM C64 Objects / Verb fixes, with minor clean up applied.
svn-id: r42737
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index bdc2a4d387..3851cc7fb7 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -134,6 +134,8 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) // Init all vars + _v0ObjectIndex = false; + _v0ObjectInInventory = false; _imuse = NULL; _imuseDigital = NULL; _musicEngine = NULL; @@ -664,7 +666,17 @@ ScummEngine_v2::ScummEngine_v2(OSystem *syst, const DetectorResult &dr) ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr) : ScummEngine_v2(syst, dr) { + _verbExecuting = false; + _verbPickup = false; _currentMode = 0; + + _activeObject2 = 0; + _activeObjectIndex = 0; + _activeObject2Index = 0; + _activeInvExecute = false; + _activeObject2Inv = false; + _activeObjectObtained = false; + _activeObject2Obtained = false; } ScummEngine_v6::ScummEngine_v6(OSystem *syst, const DetectorResult &dr) |