aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorKirben2015-05-19 20:23:21 +1000
committerKirben2015-05-19 20:23:21 +1000
commitaba98e910c9acea7063e1d21072c9943b5f26f8c (patch)
tree66d7e45441b1fe9947dd81d4f150c049af46587b /engines
parentc64652bbb651a911e7cf23bfc6274f74388f7d3a (diff)
downloadscummvm-rg350-aba98e910c9acea7063e1d21072c9943b5f26f8c.tar.gz
scummvm-rg350-aba98e910c9acea7063e1d21072c9943b5f26f8c.tar.bz2
scummvm-rg350-aba98e910c9acea7063e1d21072c9943b5f26f8c.zip
AGOS: Fix changing rooms in the PC version of Waxworks.
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/rooms.cpp2
-rw-r--r--engines/agos/saveload.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index c79b029fdc..d1d6f2b99d 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -383,7 +383,7 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
for (uint16 z = minNum; z <= maxNum; z++) {
uint16 itemNum = z + 2;
item = derefItem(itemNum);
- item->parent = 0;
+ _itemArrayPtr[itemNum] = 0;
uint16 num = (itemNum - _itemArrayInited);
_roomStates[num].state = item->state;
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 5d5e2d7b03..06ab60276d 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1293,8 +1293,7 @@ bool AGOSEngine_Elvira2::loadGame(const Common::String &filename, bool restartMo
for (uint16 z = minNum; z <= maxNum; z++) {
uint16 itemNum = z + 2;
- Item *item = derefItem(itemNum);
- item->parent = 0;
+ _itemArrayPtr[itemNum] = 0;
}
}
}