From 717102578ba4a6721c88235435ac5b51a97fa4be Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 18 Mar 2009 06:06:16 +0000
Subject: Minor corrections and cleanup.

svn-id: r39505
---
 engines/agos/rooms.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'engines/agos/rooms.cpp')

diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index ac20c3f883..e3052e7d2f 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -34,12 +34,18 @@ namespace AGOS {
 
 uint16 AGOSEngine::getBackExit(int n) {
 	switch (n) {
-		case 0:return 2;
-		case 1:return 3;
-		case 2:return 0;
-		case 3:return 1;
-		case 4:return 5;
-		case 5:return 4;
+		case 0:
+			return 2;
+		case 1:
+			return 3;
+		case 2:
+			return 0;
+		case 3:
+			return 1;
+		case 4:
+			return 5;
+		case 5:
+			return 4;
 	}
 
 	return 0;
@@ -419,10 +425,10 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
 					item->parent = 0;
 					item->child = 0;
 
-					 for (uint16 z = _itemArrayInited - 1; z; z--) {
-						itemTmp = _itemArrayPtr[z];
+					 for (uint16 z = _itemArrayInited; z; z--) {
+						itemTmp = derefItem(z);
 
-						if (itemTmp->parent == 0)
+						if (!itemTmp)
 							continue;
 						if (itemTmp->parent != itemNum)
 							continue;
@@ -437,7 +443,7 @@ bool AGOSEngine::loadRoomItems(uint16 room) {
 								break;
 							}
 
-							itemTmp = _itemArrayPtr[itemTmp->next];
+							itemTmp = derefItem(itemTmp->next);
 						}
 					}
 
-- 
cgit v1.2.3