[Scummvm-cvs-logs] CVS: tools descumm.cpp,1.40,1.41

[Max Horn]

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

Modified Files:
	descumm.cpp 
Log Message:
hack to distinguish bundle room obj scripts from 'normal' scripts

Index: descumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- descumm.cpp	16 May 2003 21:09:49 -0000	1.40
+++ descumm.cpp	16 May 2003 21:35:42 -0000	1.41
@@ -3033,14 +3033,15 @@
 			printf("File too small to be a script\n");
 			exit(0);
 		}
-#if VERB_SCRIPT
-		if (scriptVersion == 2)
-			offs_of_line = skipVerbHeader_V2(mem);
-		else
-			offs_of_line = skipVerbHeader_V3(mem );
-#else
-		mem += 4;
-#endif
+		// Hack to detect verb script: first 4 bytes should be file length
+		if (TO_LE_32(*((uint32 *)mem)) == size_of_code) {
+			if (scriptVersion == 2)
+				offs_of_line = skipVerbHeader_V2(mem);
+			else
+				offs_of_line = skipVerbHeader_V3(mem );
+		} else {
+			mem += 4;
+		}
 	} else if (scriptVersion == 5) {
 		if (size_of_code < 8) {
 			printf("File too small to be a script\n");