[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.50,1.51

[Max Horn]

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

Modified Files:
	descumm6.cpp 
Log Message:
allow script 4 in COMI to be disassmbled

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- descumm6.cpp	23 Dec 2002 15:49:34 -0000	1.50
+++ descumm6.cpp	23 Dec 2002 18:44:59 -0000	1.51
@@ -945,15 +945,15 @@
 			}
 			i = get_byte();
 			switch (i) {
-			case 3:
-				e += sprintf(e, ":wait:");
-				break;
 			case 1:
 				e += sprintf(e, ":newline:");
 				break;
 			case 2:
 				e += sprintf(e, ":keeptext:");
 				break;
+			case 3:
+				e += sprintf(e, ":wait:");
+				break;
 			case 4:	// V8 - TODO
 				{
 				StackEnt foo;
@@ -1349,16 +1349,15 @@
 	case 0x74:
 		// FIXME - is this correct?!? Also, make the display nicer...
 		ext("x" "dim2\0"
-				"\x0Appw|dim-scummvar,"
-				"\x0Bppw|dim-string,"
-				"\xCAw|undim"
+				"\x0Appw|dim2-scummvar,"
+				"\x0Bppw|dim2-string,"
+				"\xCAw|undim2"
 				);
-
 		break;
 	case 0x75:
 		se_a = pop();
 		se_b = pop();
-		writeArray(get_word(), se_b, pop(), se_a);
+		writeArray(get_word(), pop(), se_b, se_a);
 		break;
 	case 0x76:
 		switch (get_byte()) {
@@ -1597,6 +1596,8 @@
 				"\xE|remapCostumeInsert,"
 				"\xF|setVideoFrameRate,"
 
+				"\x16|setBannerColors,"
+
 				"\x1D|setKeyScript,"
 				
 				"\x6C|buildPaletteShadow"
@@ -2094,7 +2095,12 @@
 				"\x42p|color,"
 				"\x43p|right,"
 				"\x45|center,"
-				"\x47|left," "\x48|overhead," "\x4A|new3," "\x4Bs|msg," "\xFE|begin," "\xFF|end");
+				"\x47|left,"
+				"\x48|overhead,"
+				"\x4A|new3,"
+				"\x4Bs|msg,"
+				"\xFE|begin,"
+				"\xFF|end");
 		break;
 	case 0xB5:
 		ext("m" "print_1_\0"
@@ -2103,7 +2109,12 @@
 				"\x42p|color,"
 				"\x43p|right,"
 				"\x45|center,"
-				"\x47|left," "\x48|overhead," "\x4A|new3," "\x4Bs|msg," "\xFE|begin," "\xFF|end");
+				"\x47|left,"
+				"\x48|overhead,"
+				"\x4A|new3,"
+				"\x4Bs|msg,"
+				"\xFE|begin,"
+				"\xFF|end");
 		break;
 	case 0xB6:
 		ext("m" "print_2_\0"