[Scummvm-cvs-logs] CVS: tools descumm3.cpp,1.24,1.25

[Jonathan Gray]

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

Modified Files:
	descumm3.cpp 
Log Message:
patch #730032 from erik and some local changes

Index: descumm3.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm3.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- descumm3.cpp	28 Apr 2003 17:29:22 -0000	1.24
+++ descumm3.cpp	30 Apr 2003 10:14:27 -0000	1.25
@@ -1057,9 +1057,10 @@
 		do_tok(buf, "colorCycleDelay", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
 		break;
 	default:
-		strcpy(buf, "Unknown??");
-		printf("UGH, unknown room op %d\n", opcode & 0x1F);
-		exit(1);
+		// strcpy(buf, "Unknown??");
+		// printf("UGH, unknown room op %d\n", opcode & 0x1F);
+		// exit(1);
+		sprintf(buf, "UnknownRoomCommand%.2X", opcode);
 	}
 }
 
@@ -1109,7 +1110,10 @@
 		break;
 
 	case 0x0E:
-		do_tok(buf, "CursorCommand", A1VARUNTIL0xFF);
+		if (GF_UNBLOCKED || gameFlag == 1)
+			do_tok(buf, "LoadCharset", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B));
+		else
+			do_tok(buf, "CursorCommand", A1VARUNTIL0xFF);
 		break;
 	default:
 		sprintf(buf, "UnknownCursorCommand%.2X", opcode);
@@ -1498,6 +1502,7 @@
 
 	case 0x05:
 	case 0x25:
+	case 0x45:
 	case 0x65:
 	case 0x85:
 	case 0xA5:
@@ -2095,7 +2100,6 @@
 		do_tok(buf, "pickupObject", ((opcode & 0x80) ? A1V : A1W));
 		break;
 
-	case 0x45:
 	case 0xC5:
 	default:
 		if (HaltOnError) {