[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.58,1.59

Max Horn fingolfin at users.sourceforge.net
Thu May 22 16:36:02 CEST 2003


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

Modified Files:
	descumm.cpp 
Log Message:
fixeed setState opcodes

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- descumm.cpp	22 May 2003 23:25:30 -0000	1.58
+++ descumm.cpp	22 May 2003 23:34:59 -0000	1.59
@@ -1667,26 +1667,7 @@
 		// chainScript
 		do_tok(buf, "chainScript", ((opcode & 0x80) ? A1V : A1B));
 		break;
-	case 0x77:
-	case 0xF7:
-		// clearState01
-		do_tok(buf, "clearState01", ((opcode & 0x80) ? A1V : A1W));
-		break;
-	case 0x57:
-	case 0xD7:
-		// clearState02
-		do_tok(buf, "clearState02", ((opcode & 0x80) ? A1V : A1W));
-		break;
-	case 0x67:
-	case 0xE7:
-		// clearState04
-		do_tok(buf, "clearState04", ((opcode & 0x80) ? A1V : A1W));
-		break;
-	case 0x47:
-	case 0xC7:
-		// clearState08
-		do_tok(buf, "clearState08", ((opcode & 0x80) ? A1V : A1W));
-		break;
+
 	case 0x60:
 	case 0xE0:
 		//cursorCommand
@@ -2058,26 +2039,48 @@
 		do_tok(buf, "setOwnerOf", ((opcode & 0x80) ? A1V : A1W) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 		
+	case 0x77:
+	case 0xF7:
+		// clearState01
+		do_tok(buf, "clearState01", ((opcode & 0x80) ? A1V : A1W));
+		break;
+	case 0x57:
+	case 0xD7:
+		// clearState02
+		do_tok(buf, "clearState02", ((opcode & 0x80) ? A1V : A1W));
+		break;
+	case 0x67:
+	case 0xE7:
+		// clearState04
+		do_tok(buf, "clearState04", ((opcode & 0x80) ? A1V : A1W));
+		break;
+	case 0x47:
+	case 0xC7:
+		// clearState08
+		do_tok(buf, "clearState08", ((opcode & 0x80) ? A1V : A1W));
+		break;
+
 	case 0x37:
 	case 0xB7:
 		//setState01
-		do_tok(buf, "setState01", A1W);
+		do_tok(buf, "setState01", ((opcode & 0x80) ? A1V : A1W));
 		break;
 	case 0x17:
 	case 0x97:
 		//setState02
-		do_tok(buf, "setState02", A1W);
+		do_tok(buf, "setState02", ((opcode & 0x80) ? A1V : A1W));
 		break;
 	case 0x27:
 	case 0xA7:
 		//setState04
-		do_tok(buf, "setState04", A1W);
+		do_tok(buf, "setState04", ((opcode & 0x80) ? A1V : A1W));
 		break;
 	case 0x07:
 	case 0x87:
 		//setState08
-		do_tok(buf, "setState08", A1W);
+		do_tok(buf, "setState08", ((opcode & 0x80) ? A1V : A1W));
 		break;
+
 	case 0x26:
 	case 0xA6: {
 			int i;





More information about the Scummvm-git-logs mailing list