[Scummvm-cvs-logs] scummvm master -> aba98e910c9acea7063e1d21072c9943b5f26f8c

Kirben kirben at optusnet.com.au
Tue May 19 12:24:45 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
aba98e910c AGOS: Fix changing rooms in the PC version of Waxworks.


Commit: aba98e910c9acea7063e1d21072c9943b5f26f8c
    https://github.com/scummvm/scummvm/commit/aba98e910c9acea7063e1d21072c9943b5f26f8c
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-05-19T20:23:21+10:00

Commit Message:
AGOS: Fix changing rooms in the PC version of Waxworks.

Changed paths:
    engines/agos/rooms.cpp
    engines/agos/saveload.cpp



diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index c79b029..d1d6f2b 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 5d5e2d7..06ab602 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;
 					}
 				}
 			}






More information about the Scummvm-git-logs mailing list