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

[kirben at users.sourceforge.net]

Revision: 24645
          http://svn.sourceforge.net/scummvm/?rev=24645&view=rev
Author:   kirben
Date:     2006-11-06 15:58:15 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
Fix restarting game in Elvira 1

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

Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp	2006-11-06 23:32:37 UTC (rev 24644)
+++ scummvm/trunk/engines/agos/saveload.cpp	2006-11-06 23:58:15 UTC (rev 24645)
@@ -625,11 +625,11 @@
 	for (num = _itemArrayInited - 1; num; num--) {
 		Item *item = _itemArrayPtr[item_index++], *parent_item;
 
-		uint16 parent = f->readUint32BE();
-		if (parent == 0xFFFF)
+		uint32 parent = f->readUint32BE();
+		if (parent == 0xFFFFFFFF)
 			parent_item = 0;
 		else
-			parent_item = derefItem(parent);
+			parent_item = derefItem(parent + 1);
 
 		setItemParent(item, parent_item);
 
@@ -657,11 +657,11 @@
 				u->userFlags[i] = f->readUint16BE();
 			}
 
-			uint16 val = f->readUint32BE();
-			if (val == 0xFFFF)
+			uint32 val = f->readUint32BE();
+			if (val == 0xFFFFFFFF)
 				u->userItems[0] = 0;
 			else
-				u->userItems[0] = val;
+				u->userItems[0] = val + 1;
 		}
 	}
 
@@ -722,7 +722,7 @@
 		if (item->parent == 0)
 			f->writeUint32BE(0xFFFFFFFF);
 		else
-			f->writeUint32BE(item->parent);
+			f->writeUint32BE(item->parent - 1);
 
 		f->writeUint16BE(item->state);
 		f->writeUint16BE(item->classFlags);
@@ -751,7 +751,7 @@
 			if (u->userItems[0] == 0)
 				f->writeUint32BE(0xFFFFFFFF);
 			else
-				f->writeUint32BE(u->userItems[0]);
+				f->writeUint32BE(u->userItems[0] - 1);
 		}
 	}
 


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