[Scummvm-cvs-logs] SF.net SVN: scummvm:[39505] scummvm/trunk/engines/agos/rooms.cpp

[Kirben at users.sourceforge.net]

Revision: 39505
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39505&view=rev
Author:   Kirben
Date:     2009-03-18 06:06:16 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Minor corrections and cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/rooms.cpp

Modified: scummvm/trunk/engines/agos/rooms.cpp
===================================================================
--- scummvm/trunk/engines/agos/rooms.cpp	2009-03-18 06:02:55 UTC (rev 39504)
+++ scummvm/trunk/engines/agos/rooms.cpp	2009-03-18 06:06:16 UTC (rev 39505)
@@ -34,12 +34,18 @@
 
 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 @@
 					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 @@
 								break;
 							}
 
-							itemTmp = _itemArrayPtr[itemTmp->next];
+							itemTmp = derefItem(itemTmp->next);
 						}
 					}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.