[Scummvm-cvs-logs] SF.net SVN: scummvm: [23684] scummvm/trunk/engines/simon/res.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sun Aug 6 07:38:25 CEST 2006


Revision: 23684
Author:   kirben
Date:     2006-08-05 22:38:19 -0700 (Sat, 05 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23684&view=rev

Log Message:
-----------
Fix bug #1535261  FF:Dock Crash - decompressData error

Modified Paths:
--------------
    scummvm/trunk/engines/simon/res.cpp
Modified: scummvm/trunk/engines/simon/res.cpp
===================================================================
--- scummvm/trunk/engines/simon/res.cpp	2006-08-05 23:08:52 UTC (rev 23683)
+++ scummvm/trunk/engines/simon/res.cpp	2006-08-06 05:38:19 UTC (rev 23684)
@@ -775,6 +775,12 @@
 			loadOffsets((const char*)"speech.wav", speechId, file, offset, srcSize, dstSize);
 		}
 
+		// Voice segment doesn't exist
+		if (offset == 0xFFFFFFFF && srcSize == 0xFFFFFFFF && dstSize == 0xFFFFFFFF) {
+			debug(0, "loadVoice: speechId %d removed", speechId);
+			return;
+		}
+
 		if (getPlatform() == Common::kPlatformAmiga)
 			sprintf(filename, "sp%d.wav", file);
 		else


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