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

[thebluegr at users.sourceforge.net]

Revision: 49501
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49501&view=rev
Author:   thebluegr
Date:     2010-06-08 13:15:05 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
Add a version check for base36 encoded patches - they were introduced in SCI2

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-08 09:36:27 UTC (rev 49500)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-08 13:15:05 UTC (rev 49501)
@@ -621,7 +621,9 @@
 			case kSourceDirectory:
 				readResourcePatches(source);
 #ifdef ENABLE_SCI32
-				readResourcePatchesBase36(source);
+				// We can't use getSciVersion() at this point, thus using _volVersion
+				if (_volVersion == kResVersionSci32)	// SCI2+
+					readResourcePatchesBase36(source);
 #endif
 				readWaveAudioPatches();
 				break;
@@ -1180,6 +1182,8 @@
 			inputName.toUppercase();
 			if (inputName.hasPrefix("BOOT"))	// skip bootdisk.*
 				continue;
+			if (inputName.hasSuffix("DRV"))		// skip AUD*.DRV
+				continue;
 
 			inputName.deleteChar(0);	// delete the first character (type)
 			inputName.deleteChar(7);	// delete the dot


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