[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.105,1.106

[kirben]

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

Modified Files:
	descumm.cpp 
Log Message:

Correction to last commits.


Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- descumm.cpp	24 Sep 2005 06:28:09 -0000	1.105
+++ descumm.cpp	24 Sep 2005 13:19:04 -0000	1.106
@@ -1731,8 +1731,9 @@
 	int state = 0;
 
 	var[0] = 0;
-	if (scriptVersion > 0)
+	if (scriptVersion > 0) {
 		get_var_or_word(var, opcode & 0x80);
+	}
 
 	if (scriptVersion > 2) {
 		switch (opcode & 0x2F) {
@@ -2803,27 +2804,27 @@
 
     case 0x0f:
     case 0x4f:
-		do_tok(buf, "clearState02", 0);
+		do_tok(buf, "clearState02", ((opcode & 0x40) ? 0 : A1B));
 		break;
 	case 0x37:
 	case 0x77:
-		do_tok(buf, "clearState04", 0);
+		do_tok(buf, "clearState04", ((opcode & 0x40) ? 0 : A1B));
 		break;
 	case 0x17:
 	case 0x57:
-		do_tok(buf, "clearState08", 0);
+		do_tok(buf, "clearState08", ((opcode & 0x40) ? 0 : A1B));
 		break;
     case 0x8f:
     case 0xcf:
-		do_tok(buf, "setState02", 0);
+		do_tok(buf, "setState02", ((opcode & 0x40) ? 0 : A1B));
 		break;
 	case 0xb7:
 	case 0xf7:
-		do_tok(buf, "setState04", 0);
+		do_tok(buf, "setState04", ((opcode & 0x40) ? 0 : A1B));
 		break;
 	case 0x97:
 	case 0xd7:
-		do_tok(buf, "setState08", 0);
+		do_tok(buf, "setState08", ((opcode & 0x40) ? 0 : A1B));
 		break;
 
     case 0x3f: