[Scummvm-cvs-logs] scummvm master -> 08744f4ebf140a826715af2c295f4c3cc393bce2

Kirben kirben at optusnet.com.au
Mon May 18 08:11:12 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:
08744f4ebf AGOS: Fix restoring room state, when changing rooms in PC version of Waxworks.


Commit: 08744f4ebf140a826715af2c295f4c3cc393bce2
    https://github.com/scummvm/scummvm/commit/08744f4ebf140a826715af2c295f4c3cc393bce2
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-05-18T16:09:44+10:00

Commit Message:
AGOS: Fix restoring room state, when changing rooms in PC version of Waxworks.

Changed paths:
    engines/agos/rooms.cpp



diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index 6185653..0eac79e 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -446,13 +446,13 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
 
 							itemTmp = derefItem(itemTmp->next);
 						}
-					}
 
-					uint16 num = (itemNum - _itemArrayInited);
-					item->state = _roomStates[num].state;
-					item->classFlags = _roomStates[num].classFlags;
-					SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
-					subRoom->roomExitStates = _roomStates[num].roomExitStates;
+						uint16 num = (itemNum - _itemArrayInited);
+						item->state = _roomStates[num].state;
+						item->classFlags = _roomStates[num].classFlags;
+						SubRoom *subRoom = (SubRoom *)findChildOfType(item, kRoomType);
+						subRoom->roomExitStates = _roomStates[num].roomExitStates;
+					 }
 				}
 				in.close();
 






More information about the Scummvm-git-logs mailing list