[Scummvm-cvs-logs] SF.net SVN: scummvm: [21720] scummvm/trunk/engines/cine/various.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 21720
Author:   eriktorbjorn
Date:     2006-04-09 03:54:41 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21720&view=rev

Log Message:
-----------
Minor cleanup, but savegames still don't work as well as I had hoped...

Modified Paths:
--------------
    scummvm/trunk/engines/cine/various.cpp
Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2006-04-09 09:21:21 UTC (rev 21719)
+++ scummvm/trunk/engines/cine/various.cpp	2006-04-09 10:54:41 UTC (rev 21720)
@@ -366,7 +366,7 @@
 
 int16 currentDisk;
 
-void loadObjectScritpFromSave(Common::File *fHandle) {
+void loadObjectScriptFromSave(Common::File *fHandle) {
 	int16 i;
 
 	prcLinkedListStruct *newElement;
@@ -393,9 +393,7 @@
 		newElement->localVars[i] = fHandle->readUint16BE();
 
 	newElement->compareResult = fHandle->readUint16BE();
-
 	newElement->scriptPosition = fHandle->readUint16BE();
-
 	newElement->scriptIdx = fHandle->readUint16BE();
 
 	newElement->scriptPtr = (byte *)relTable[newElement->scriptIdx].data;
@@ -643,7 +641,7 @@
 	defaultMenuBoxColor2 = fHandle.readUint16BE();
 
 	fHandle.readUint16BE();
-	fHandle.readSint16BE();
+	fHandle.readUint16BE();
 
 	for (i = 0; i < NUM_MAX_ANIMDATA; i++) {
 		animDataTable[i].width = fHandle.readUint16BE();
@@ -655,7 +653,13 @@
 		fHandle.read(animDataTable[i].name, 10);
 	}
 
-	fHandle.seek(12, SEEK_CUR);	// TODO: handle screen params (realy required ?)
+	// TODO: handle screen params (realy required ?)
+	fHandle.readUint16BE();
+	fHandle.readUint16BE();
+	fHandle.readUint16BE();
+	fHandle.readUint16BE();
+	fHandle.readUint16BE();
+	fHandle.readUint16BE();
 
 	size = fHandle.readSint16BE();
 	for (i = 0; i < size; i++) {
@@ -664,7 +668,7 @@
 
 	size = fHandle.readSint16BE();
 	for (i = 0; i < size; i++) {
-		loadObjectScritpFromSave(&fHandle);
+		loadObjectScriptFromSave(&fHandle);
 	}
 
 	size = fHandle.readSint16BE();
@@ -787,6 +791,7 @@
 	fHandle.writeUint16BE(var2);
 	fHandle.writeUint16BE(commandVar2);
 	fHandle.writeUint16BE(defaultMenuBoxColor2);
+
 	fHandle.writeUint16BE(0xFF);
 	fHandle.writeUint16BE(0x1E);
 
@@ -832,7 +837,6 @@
 
 			fHandle.writeUint16BE(currentHead->compareResult);
 			fHandle.writeUint16BE(currentHead->scriptPosition);
-
 			fHandle.writeUint16BE(currentHead->scriptIdx);
 
 			currentHead = currentHead->next;
@@ -864,7 +868,6 @@
 
 			fHandle.writeUint16BE(currentHead->compareResult);
 			fHandle.writeUint16BE(currentHead->scriptPosition);
-
 			fHandle.writeUint16BE(currentHead->scriptIdx);
 
 			currentHead = currentHead->next;


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