[Scummvm-cvs-logs] scummvm master -> 1aa67cbc9630505452afa23e2db30c52a34178e4

[Kirben]

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:
1aa67cbc96 AGOS: Revert last change for PC version of Waxworks.


Commit: 1aa67cbc9630505452afa23e2db30c52a34178e4
    https://github.com/scummvm/scummvm/commit/1aa67cbc9630505452afa23e2db30c52a34178e4
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-05-18T17:12:08+10:00

Commit Message:
AGOS: Revert last change for PC version of Waxworks.

Changed paths:
    engines/agos/rooms.cpp



diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index 0eac79e..c79b029 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -446,13 +446,14 @@ 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();