[Scummvm-cvs-logs] SF.net SVN: scummvm:[47603] scummvm/trunk/engines/sci/resource.cpp

[thebluegr at users.sourceforge.net]

Revision: 47603
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47603&view=rev
Author:   thebluegr
Date:     2010-01-27 16:59:20 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
Don't patch audio36 resources, when the associated patches are for audio resources (e.g. the sound effects in LB2CD)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-01-27 16:54:58 UTC (rev 47602)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-01-27 16:59:20 UTC (rev 47603)
@@ -996,8 +996,13 @@
 	patch_data_offset = file.readByte();
 
 	if (patchtype != restype) {
-		debug("Patching %s failed - resource type mismatch", source->location_name.c_str());
-		return;
+		// audio and audio36 resources got the same extension, so don't try and load them twice
+		if (patchtype == kResourceTypeAudio && restype == kResourceTypeAudio36) {
+			return;	// don't throw a warning, the relevant audio resource has already been patched
+		} else {
+			debug("Patching %s failed - resource type mismatch", source->location_name.c_str());
+			return;
+		}
 	}
 
 	// Fixes SQ5/German, patch file special case logic taken from SCI View disassembly


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