[Scummvm-cvs-logs] CVS: scummvm/sound voc.cpp,1.13.2.5,1.13.2.6

Travis Howell kirben at users.sourceforge.net
Thu Aug 5 17:50:01 CEST 2004


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

Modified Files:
      Tag: branch-0-6-0
	voc.cpp 
Log Message:

Missed one spot.


Index: voc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.cpp,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -u -d -r1.13.2.5 -r1.13.2.6
--- voc.cpp	3 Aug 2004 10:14:10 -0000	1.13.2.5
+++ voc.cpp	6 Aug 2004 00:48:55 -0000	1.13.2.6
@@ -141,7 +141,9 @@
 	//int32 offset = FROM_LE_16(fileHeader.datablock_offset);
 	int16 version = FROM_LE_16(fileHeader.version);
 	int16 code = FROM_LE_16(fileHeader.id);
-	assert(version == 0x010A || version == 0x0114);
+	// 0x100 is an invalid VOC version used by German version of DOTT (Disk) and
+	// French version of Simon the Sorcerer 2 (CD)
+	assert(version == 0x010A || version == 0x0114 || version == 0x0100);
 	assert(code == ~version + 0x1234);
 
 	int len;





More information about the Scummvm-git-logs mailing list