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

[thebluegr at users.sourceforge.net]

Revision: 47604
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47604&view=rev
Author:   thebluegr
Date:     2010-01-27 17:31:11 +0000 (Wed, 27 Jan 2010)

Log Message:
-----------
Do not try and patch files for resource types greater or equal to audio36 (i.e. audio36, sync36 etc), as these won't work with the current patch scheme

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:59:20 UTC (rev 47603)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-01-27 17:31:11 UTC (rev 47604)
@@ -996,13 +996,7 @@
 	patch_data_offset = file.readByte();
 
 	if (patchtype != restype) {
-		// 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;
-		}
+		debug("Patching %s failed - resource type mismatch", source->location_name.c_str());
 	}
 
 	// Fixes SQ5/German, patch file special case logic taken from SCI View disassembly
@@ -1052,7 +1046,10 @@
 	const char *szResType;
 	ResourceSource *psrcPatch;
 
-	for (int i = kResourceTypeView; i < kResourceTypeInvalid; ++i) {
+	// Do not try and patch files for resource types greater or
+	// equal to audio36 (i.e. audio36, sync36, robot etc), as these won't work
+	// with this patch scheme
+	for (int i = kResourceTypeView; i < kResourceTypeAudio36; ++i) {
 		files.clear();
 		szResType = getResourceTypeName((ResourceType)i);
 		// SCI0 naming - type.nnn


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