[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.53,2.54 script_v6he.cpp,2.142,2.143

kirben kirben at users.sourceforge.net
Tue Feb 22 05:56:23 CET 2005


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

Modified Files:
	script_v100he.cpp script_v6he.cpp 
Log Message:

Minor cleanup


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- script_v100he.cpp	22 Feb 2005 01:37:57 -0000	2.53
+++ script_v100he.cpp	22 Feb 2005 13:54:38 -0000	2.54
@@ -836,7 +836,7 @@
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o100_setSpriteGroupInfo (%d)", subOp);
+	debug(1,"o100_setSpriteGroupInfo stub (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		pop();

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.142
retrieving revision 2.143
diff -u -d -r2.142 -r2.143
--- script_v6he.cpp	1 Jan 2005 16:09:16 -0000	2.142
+++ script_v6he.cpp	22 Feb 2005 13:54:38 -0000	2.143
@@ -882,7 +882,6 @@
 
 void ScummEngine_v60he::o60_kernelGetFunctions() {
 	int args[29];
-	int retval;
 	ArrayHeader *ah;
 	getStackList(args, ARRAYSIZE(args));
 
@@ -891,11 +890,9 @@
 		// Used to store images when decorating cake in
 		// Fatty Bear's Birthday Surprise
 		writeVar(0, 0);
-		defineArray(0, kByteArray, 0, virtScreenSave(0, args[1], args[2], args[3], args[4]));
-		retval = readVar(0);
-		ah = (ArrayHeader *)getResourceAddress(rtString, retval);
+		ah = defineArray(0, kByteArray, 0, virtScreenSave(0, args[1], args[2], args[3], args[4]));
 		virtScreenSave(ah->data, args[1], args[2], args[3], args[4]);
-		push(retval);
+		push(readVar(0));
 		break;
 	default:
 		error("o60_kernelGetFunctions: default case %d", args[0]);





More information about the Scummvm-git-logs mailing list