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

Travis Howell kirben at users.sourceforge.net
Tue Aug 3 03:15:01 CEST 2004


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

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

Back port VOC fix for DOTT/Simon2


Index: voc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.cpp,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -d -r1.13.2.4 -r1.13.2.5
--- voc.cpp	29 Jul 2004 09:44:25 -0000	1.13.2.4
+++ voc.cpp	3 Aug 2004 10:14:10 -0000	1.13.2.5
@@ -56,7 +56,9 @@
 	int32 offset = READ_LE_UINT16(ptr + 20);
 	int16 version = READ_LE_UINT16(ptr + 22);
 	int16 code = READ_LE_UINT16(ptr + 24);
-	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