[Scummvm-cvs-logs] SF.net SVN: scummvm:[44220] scummvm/branches/branch-1-0-0/engines/tucker/ resource.cpp

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sun Sep 20 21:57:39 CEST 2009


Revision: 44220
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44220&view=rev
Author:   cyx
Date:     2009-09-20 19:57:39 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
TUCKER: ignore compressed sound file load if made with latest version of compress_tucker tool (need more changed to be backmerged from trunk)

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/tucker/resource.cpp

Modified: scummvm/branches/branch-1-0-0/engines/tucker/resource.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/tucker/resource.cpp	2009-09-20 19:30:50 UTC (rev 44219)
+++ scummvm/branches/branch-1-0-0/engines/tucker/resource.cpp	2009-09-20 19:57:39 UTC (rev 44220)
@@ -216,12 +216,14 @@
 	for (int i = 0; compressedSoundFilesTable[i].filename; ++i) {
 		if (_fCompressedSound.open(compressedSoundFilesTable[i].filename)) {
 			int version = _fCompressedSound.readUint16LE();
-			if (version == kCurrentCompressedSoundDataVersion) {
+			int flags = _fCompressedSound.readUint16LE();
+			if (version == kCurrentCompressedSoundDataVersion && flags == 0) {
 				_compressedSoundType = i;
 				debug(1, "Using compressed sound file '%s'", compressedSoundFilesTable[i].filename);
 				return;
 			}
-			warning("Unhandled version %d for compressed sound file '%s'", version, compressedSoundFilesTable[i].filename);
+			warning("Unhandled version %d (flags 0x%X) for compressed sound file '%s'", version, flags, compressedSoundFilesTable[i].filename);
+			_fCompressedSound.close();
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list