[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.37,1.38

[Max Horn]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv6611

Modified Files:
	descumm6.cpp 
Log Message:
fixed array display; changed how names of variables and arrays are formed (var-123 instead of var[123])

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- descumm6.cpp	23 Dec 2002 02:53:44 -0000	1.37
+++ descumm6.cpp	23 Dec 2002 03:00:06 -0000	1.38
@@ -771,13 +771,13 @@
 				if ((s = getVarName(var)) != NULL)
 					where = strecpy(where, s);
 				else
-					where += sprintf(where, "var[%ld]", se->data & 0xFFFFFFF);
+					where += sprintf(where, "var-%ld", se->data & 0xFFFFFFF);
 			} else if (se->data & 0x80000000) {
-				where += sprintf(where, "bitvar[%ld]", se->data & 0x7FFFFFFF);
+				where += sprintf(where, "bitvar-%ld", se->data & 0x7FFFFFFF);
 			} else if (se->data & 0x40000000) {
-				where += sprintf(where, "localvar[%ld]", se->data & 0xFFFFFFF);
+				where += sprintf(where, "localvar-%ld", se->data & 0xFFFFFFF);
 			} else {
-				where += sprintf(where, "??var??[%ld]", se->data & 0xFFFFFFFF);
+				where += sprintf(where, "?var?-%ld", se->data);
 			}
 		} else {
 			if (!(se->data & 0xF000)) {
@@ -785,25 +785,25 @@
 				if ((s = getVarName(var)) != NULL)
 					where = strecpy(where, s);
 				else
-					where += sprintf(where, "var[%ld]", se->data & 0xFFF);
+					where += sprintf(where, "var-%ld", se->data & 0xFFF);
 			} else if (se->data & 0x8000) {
-				where += sprintf(where, "bitvar[%ld]", se->data & 0x7FFF);
+				where += sprintf(where, "bitvar-%ld", se->data & 0x7FFF);
 			} else if (se->data & 0x4000) {
-				where += sprintf(where, "localvar[%ld]", se->data & 0xFFF);
+				where += sprintf(where, "localvar-%ld", se->data & 0xFFF);
 			} else {
-				where += sprintf(where, "??var??[%ld]", se->data & 0xFFFF);
+				where += sprintf(where, "?var?-%ld", se->data);
 			}
 		}
 		break;
 	case seArray:
 		if (se->left) {
-			where += sprintf(where, "array[%ld][", se->data);
+			where += sprintf(where, "array-%ld[", se->data);
 			where = se_astext(se->left, where);
 			where = strecpy(where, "][");
 			where = se_astext(se->right, where);
 			where = strecpy(where, "]");
 		} else {
-			where += sprintf(where, "array[%ld][", se->data);
+			where += sprintf(where, "array-%ld[", se->data);
 			where = se_astext(se->right, where);
 			where = strecpy(where, "]");
 		}
@@ -1244,7 +1244,7 @@
 void next_line_V8()
 {
 	byte code = get_byte();
-	StackEnt *se_a;
+	StackEnt *se_a, *se_b;
 
 	switch (code) {
 	case 0x1:
@@ -1341,10 +1341,13 @@
 				);
 		break;
 	case 0x71:
-		writeArray(get_word(), NULL, pop(), pop());
+		se_a = pop();
+		writeArray(get_word(), NULL, pop(), se_a);
 		break;
 	case 0x75:
-		writeArray(get_word(), pop(), pop(), pop());
+		se_a = pop();
+		se_b = pop();
+		writeArray(get_word(), se_b, pop(), se_a);
 		break;
 	case 0x76:
 		// FIXME - is this correct?!?