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

[mthreepwood at users.sourceforge.net]

Revision: 55751
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55751&view=rev
Author:   mthreepwood
Date:     2011-02-03 12:42:52 +0000 (Thu, 03 Feb 2011)

Log Message:
-----------
SCI: Fix KQ6 Mac audio resources

A regression from r55715

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2011-02-03 05:10:24 UTC (rev 55750)
+++ scummvm/trunk/engines/sci/resource.cpp	2011-02-03 12:42:52 UTC (rev 55751)
@@ -1873,7 +1873,7 @@
 
 				// If we have a file name on an audio resource, we've got an audio36
 				// resource. Parse the file name to get the id.
-				if (!resourceName.empty() && !resourceName.contains("AUD"))
+				if (!resourceName.empty() && resourceName[0] == '@')
 					resId = convertPatchNameBase36(kResourceTypeAudio36, resourceName);
 				else
 					resId = ResourceId(type, idArray[j]);
@@ -1881,7 +1881,7 @@
 				Common::String resourceName = _macResMan->getResName(tagArray[i], idArray[j]);
 
 				// Same as with audio36 above
-				if (!resourceName.empty() && !resourceName.contains("SYN"))
+				if (!resourceName.empty() && resourceName[0] == '#')
 					resId = convertPatchNameBase36(kResourceTypeSync36, resourceName);
 				else
 					resId = ResourceId(type, idArray[j]);


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