[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.42,1.43

[Max Horn]

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

Modified Files:
	descumm.cpp 
Log Message:
some more vars

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- descumm.cpp	16 May 2003 22:25:52 -0000	1.42
+++ descumm.cpp	18 May 2003 11:33:19 -0000	1.43
@@ -113,9 +113,9 @@
 	"VAR_MACHINE_SPEED",
 	"VAR_CHARCOUNT",
 	/* 8 */
-	NULL,
-	NULL,
-	NULL,
+	"VAR_ACTIVE_VERB",
+	"VAR_ACTIVE_OBJECT1",
+	"VAR_ACTIVE_OBJECT2",
 	"VAR_NUM_ACTOR",
 	/* 12 */
 	"VAR_CURRENT_LIGHTS",
@@ -125,7 +125,7 @@
 	/* 16 */
 	NULL,
 	"VAR_MUSIC_TIMER",
-	NULL,
+	"VAR_VERB_ALLOWED",
 	"VAR_ACTOR_RANGE_MIN",
 	/* 20 */
 	"VAR_ACTOR_RANGE_MAX",
@@ -3117,7 +3117,7 @@
 			mem += 8;
 			break;											/* Exit code */
 		case 'VERB':
-			mem = skipVerbHeader_V5(mem + 8);
+			offs_of_line = skipVerbHeader_V5(mem + 8);
 			break;											/* Verb */
 		default:
 			printf("Unknown script type!\n");
@@ -3129,26 +3129,26 @@
 			exit(0);
 		}
 		switch (TO_LE_16(*((uint16 *)mem + 2))) {
-			case MKID('LS'):
-				printf("Script# %d\n", (byte)mem[8]);
-				mem += 7;
-				break;			/* Local script */
-			case MKID('SC'):
-				mem += 6;
-				break;			/* Script */
-			case MKID('EN'):
-				mem += 6;
-				break;			/* Entry code */
-			case MKID('EX'):
-				mem += 6;
-				break;			/* Exit code */
-			case MKID('OC'):
-				mem += skipVerbHeader_V3(mem);
-				break;			/* Verb */
-			default:
-				printf("Unknown script type!\n");
-				exit(0);
-			}
+		case MKID('LS'):
+			printf("Script# %d\n", (byte)mem[8]);
+			mem += 7;
+			break;			/* Local script */
+		case MKID('SC'):
+			mem += 6;
+			break;			/* Script */
+		case MKID('EN'):
+			mem += 6;
+			break;			/* Entry code */
+		case MKID('EX'):
+			mem += 6;
+			break;			/* Exit code */
+		case MKID('OC'):
+			offs_of_line = skipVerbHeader_V3(mem);
+			break;			/* Verb */
+		default:
+			printf("Unknown script type!\n");
+			exit(0);
+		}
 	}
 
 	org_pos = mem;