[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.462,1.463

Max Horn fingolfin at users.sourceforge.net
Sun Feb 5 07:50:05 CET 2006


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26976

Modified Files:
	script_v6.cpp 
Log Message:
Make debugging a little bit easier :-)

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -d -r1.462 -r1.463
--- script_v6.cpp	5 Feb 2006 00:40:47 -0000	1.462
+++ script_v6.cpp	5 Feb 2006 15:49:09 -0000	1.463
@@ -527,13 +527,15 @@
 			array, base, idx, FROM_LE_16(ah->dim1), FROM_LE_16(ah->dim2));
 	}
 
+	int val;
 	if (FROM_LE_16(ah->type) != kIntArray) {
-		return ah->data[offset];
+		val = ah->data[offset];
 	} else if (_version == 8) {
-		return (int32)READ_LE_UINT32(ah->data + offset * 4);
+		val = (int32)READ_LE_UINT32(ah->data + offset * 4);
 	} else {
-		return (int16)READ_LE_UINT16(ah->data + offset * 2);
+		val = (int16)READ_LE_UINT16(ah->data + offset * 2);
 	}
+	return val;
 }
 
 void ScummEngine_v6::writeArray(int array, int idx, int base, int value) {
@@ -2042,7 +2044,8 @@
 void ScummEngine_v6::o6_getActorFromXY() {
 	int y = pop();
 	int x = pop();
-	push(getActorFromPos(x, y));
+	int r = getActorFromPos(x, y);
+	push(r);
 }
 
 void ScummEngine_v6::o6_findObject() {





More information about the Scummvm-git-logs mailing list