[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.204,2.205 script_v7he.cpp,2.127,2.128 script_v80he.cpp,2.74,2.75

[kirben]

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

Modified Files:
	script_v72he.cpp script_v7he.cpp script_v80he.cpp 
Log Message:

Minor cleanup


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.204
retrieving revision 2.205
diff -u -d -r2.204 -r2.205
--- script_v72he.cpp	14 Feb 2005 21:18:59 -0000	2.204
+++ script_v72he.cpp	22 Feb 2005 13:51:58 -0000	2.205
@@ -1482,18 +1482,15 @@
 
 void ScummEngine_v72he::o72_kernelGetFunctions() {
 	int args[29];
-	int retval;
 	ArrayHeader *ah;
 	getStackList(args, ARRAYSIZE(args));
 
 	switch (args[0]) {
 	case 1:
 		writeVar(0, 0);
-		defineArray(0, kByteArray, 0, 0, 0, virtScreenSave(0, args[1], args[2], args[3], args[4]));
-		retval = readVar(0);
-		ah = (ArrayHeader *)getResourceAddress(rtString, retval);
+		ah = defineArray(0, kByteArray, 0, 0, 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;
 	case 1001:
 		{
@@ -1859,7 +1856,7 @@
 
 void ScummEngine_v72he::o72_readINI() {
 	byte option[100];
-	int type, retval;
+	int type;
 
 	// we pretend that we don't have .ini file
 	copyScriptString(option);
@@ -1877,9 +1874,8 @@
 	case 7: // string
 		writeVar(0, 0);
 		defineArray(0, kStringArray, 0, 0, 0, 0);
-		retval = readVar(0);
 		writeArray(0, 0, 0, 0);
-		push(retval); // var ID string
+		push(readVar(0)); // var ID string
 		break;
 	default:
 		error("o72_readINI: default type %d", type);

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.127
retrieving revision 2.128
diff -u -d -r2.127 -r2.128
--- script_v7he.cpp	14 Feb 2005 10:06:22 -0000	2.127
+++ script_v7he.cpp	22 Feb 2005 13:51:59 -0000	2.128
@@ -911,7 +911,6 @@
 void ScummEngine_v70he::o70_readINI() {
 	int len;
 	int type;
-	int retval;
 	byte option[256];
 
 	// we pretend that we don't have .ini file
@@ -930,9 +929,8 @@
 	case 2: // string
 		writeVar(0, 0);
 		defineArray(0, kStringArray, 0, 0);
-		retval = readVar(0);
 		writeArray(0, 0, 0, 0);
-		push(retval); // var ID string
+		push(readVar(0)); // var ID string
 		break;
 	default:
 		error("o70_readINI: default type %d", type);

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.74
retrieving revision 2.75
diff -u -d -r2.74 -r2.75
--- script_v80he.cpp	14 Feb 2005 07:21:17 -0000	2.74
+++ script_v80he.cpp	22 Feb 2005 13:51:59 -0000	2.75
@@ -446,7 +446,7 @@
 
 void ScummEngine_v80he::o80_readConfigFile() {
 	byte name[128], section[128], filename[256];
-	int type, retval;
+	int type;
 
 	// we pretend that we don't have .ini file
 	copyScriptString(section);
@@ -463,9 +463,8 @@
 	case 7: // string
 		writeVar(0, 0);
 		defineArray(0, kStringArray, 0, 0, 0, 0);
-		retval = readVar(0);
 		writeArray(0, 0, 0, 0);
-		push(retval); // var ID string
+		push(readVar(0)); // var ID string
 		break;
 	default:
 		error("o80_readConfigFile: default type %d", type);