Minor cleanup

svn-id: r16860

5 files changed, 10 insertions, 20 deletions

diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 0fa6498303..8b2e776836 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -836,7 +836,7 @@ void ScummEngine_v100he::o100_setSpriteGroupInfo() {
 
 	byte subOp = fetchScriptByte();
 
-	debug(1,"o100_setSpriteGroupInfo (%d)", subOp);
+	debug(1,"o100_setSpriteGroupInfo stub (%d)", subOp);
 	switch (subOp) {
 	case 0:
 		pop();
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 6420c07e27..438bfe4a7e 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -882,7 +882,6 @@ uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
 
 void ScummEngine_v60he::o60_kernelGetFunctions() {
 	int args[29];
-	int retval;
 	ArrayHeader *ah;
 	getStackList(args, ARRAYSIZE(args));
 
@@ -891,11 +890,9 @@ void ScummEngine_v60he::o60_kernelGetFunctions() {
 		// 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]);
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index ab2b7b0b84..732ee176d2 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -1482,18 +1482,15 @@ void ScummEngine_v72he::o72_traceStatus() {
 
 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_checkGlobQueue() {
 
 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 @@ void ScummEngine_v72he::o72_readINI() {
 	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);
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 851fe5fab2..f6b763f0d8 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -911,7 +911,6 @@ void ScummEngine_v70he::o70_compareString() {
 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 @@ void ScummEngine_v70he::o70_readINI() {
 	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);
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index ae943e1870..25590b3518 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -446,7 +446,7 @@ void ScummEngine_v80he::o80_localizeArrayToRoom() {
 
 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 @@ void ScummEngine_v80he::o80_readConfigFile() {
 	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);