aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorMax Horn2009-07-28 23:19:33 +0000
committerMax Horn2009-07-28 23:19:33 +0000
commiteb9600b5e95f105736f01b9adbbd603e69b51638 (patch)
tree74de124830c9592b62f7a69222340207264f2c82 /engines/scumm/scumm.cpp
parentcaacc3a6df66f036c4b3e7db89960d018af3d51c (diff)
downloadscummvm-rg350-eb9600b5e95f105736f01b9adbbd603e69b51638.tar.gz
scummvm-rg350-eb9600b5e95f105736f01b9adbbd603e69b51638.tar.bz2
scummvm-rg350-eb9600b5e95f105736f01b9adbbd603e69b51638.zip
SCUMM: Moved _inventoryOffset to ScummEngine_v2 and save it.
Fixes bug #2828417: Zak V2: inventory position isn't reset when loading. svn-id: r42870
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 409a2ce306..600b9ec385 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -217,7 +217,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_roomResource = 0;
OF_OWNER_ROOM = 0;
_verbMouseOver = 0;
- _inventoryOffset = 0;
_classData = NULL;
_actorToPrintStrFor = 0;
_sentenceNum = 0;
@@ -649,6 +648,8 @@ ScummEngine_v3old::ScummEngine_v3old(OSystem *syst, const DetectorResult &dr)
ScummEngine_v2::ScummEngine_v2(OSystem *syst, const DetectorResult &dr)
: ScummEngine_v3old(syst, dr) {
+ _inventoryOffset = 0;
+
_activeInventory = 0;
_activeObject = 0;
_activeVerb = 0;