[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.138,2.139 script_v72he.cpp,2.275,2.276 script_v80he.cpp,2.103,2.104

[kirben]

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

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

Minor cleanup.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.138
retrieving revision 2.139
diff -u -d -r2.138 -r2.139
--- script_v100he.cpp	27 Apr 2005 14:26:52 -0000	2.138
+++ script_v100he.cpp	27 Apr 2005 14:47:09 -0000	2.139
@@ -589,7 +589,7 @@
 
 	debug(1,"o100_arrayOps: case %d", subOp);
 	switch (subOp) {
-	case 35:			// SO_ASSIGN_STRING
+	case 35:
 		decodeScriptString(string);
 		len = resStrLen(string) + 1;
 		ah = defineArray(array, kStringArray, 0, 0, 0, len);
@@ -737,8 +737,9 @@
 }
 
 void ScummEngine_v100he::o100_dim2dimArray() {
-	int a, b, data;
-	int type = fetchScriptByte();
+	int data, dim1end, dim2end;
+
+	byte type = fetchScriptByte();
 	switch (type) {
 	case 41:		// SO_BIT_ARRAY
 		data = kBitArray;
@@ -762,9 +763,9 @@
 		error("o100_dim2dimArray: default case %d", type);
 	}
 
-	b = pop();
-	a = pop();
-	defineArray(fetchScriptWord(), data, 0, a, 0, b);
+	dim1end = pop();
+	dim2end = pop();
+	defineArray(fetchScriptWord(), data, 0, dim2end, 0, dim1end);
 }
 
 void ScummEngine_v100he::o100_dimArray() {
@@ -801,7 +802,7 @@
 }
 
 void ScummEngine_v100he::o100_unknownE0() {
-	int id, unk1, unk2, x, x1, y1, type;
+	int id, unk1, unk2, x, x1, y1;
 
 	unk2 = pop();
 	id = pop();
@@ -814,16 +815,13 @@
 
 	switch (subOp) {
 	case 1:
-		type = 2;
-		unknownE0(x1, y1, x, unk1, unk2, type, id);
+		unknownE0(x1, y1, x, unk1, unk2, 2, id);
 		break;
 	case 20:
-		type = 1;
-		unknownE0(x1, y1, x, unk1, unk2, type, id);
+		unknownE0(x1, y1, x, unk1, unk2, 1, id);
 		break;
 	case 40:
-		type = 3;
-		unknownE0(x1, y1, x, unk1, unk2, type, id);
+		unknownE0(x1, y1, x, unk1, unk2, 3, id);
 		break;
 	default:
 		error("o100_unknownE0: default case %d", subOp);

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.275
retrieving revision 2.276
diff -u -d -r2.275 -r2.276
--- script_v72he.cpp	27 Apr 2005 14:26:52 -0000	2.275
+++ script_v72he.cpp	27 Apr 2005 14:47:10 -0000	2.276
@@ -1534,7 +1534,7 @@
 			dim2start++;
 		}
 		break;
-	case 194:			// SO_ASSIGN_STRING
+	case 194:
 		decodeScriptString(string);
 		len = resStrLen(string) + 1;
 		ah = defineArray(array, kStringArray, 0, 0, 0, len);
@@ -1619,8 +1619,9 @@
 
 
 void ScummEngine_v72he::o72_dim2dimArray() {
-	int a, b, data;
-	int type = fetchScriptByte();
+	int data, dim1end, dim2end;
+
+	byte type = fetchScriptByte();
 	switch (type) {
 	case 2:		// SO_BIT_ARRAY
 		data = kBitArray;
@@ -1644,9 +1645,9 @@
 		error("o72_dim2dimArray: default case %d", type);
 	}
 
-	b = pop();
-	a = pop();
-	defineArray(fetchScriptWord(), data, 0, a, 0, b);
+	dim1end = pop();
+	dim2end = pop();
+	defineArray(fetchScriptWord(), data, 0, dim2end, 0, dim1end);
 }
 
 void ScummEngine_v72he::o72_traceStatus() {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.103
retrieving revision 2.104
diff -u -d -r2.103 -r2.104
--- script_v80he.cpp	27 Apr 2005 14:26:52 -0000	2.103
+++ script_v80he.cpp	27 Apr 2005 14:47:10 -0000	2.104
@@ -745,7 +745,7 @@
 }
 
 void ScummEngine_v80he::o80_unknownE0() {
-	int id, unk1, unk2, x, x1, y1, type;
+	int id, unk1, unk2, x, x1, y1;
 
 	unk2 = pop();
 	id = pop();
@@ -758,16 +758,13 @@
 
 	switch (subOp) {
 	case 55:
-		type = 2;
-		unknownE0(x1, y1, x, unk1, unk2, type, id);
+		unknownE0(x1, y1, x, unk1, unk2, 2, id);
 		break;
 	case 63:
-		type = 3;
-		unknownE0(x1, y1, x, unk1, unk2, type, id);
+		unknownE0(x1, y1, x, unk1, unk2, 3, id);
 		break;
 	case 66:
-		type = 1;
-		unknownE0(x1, y1, x, unk1, unk2, type, id);
+		unknownE0(x1, y1, x, unk1, unk2, 1, id);
 		break;
 	default:
 		error("o80_unknownE0: default case %d", subOp);