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

[thebluegr at users.sourceforge.net]

Revision: 54211
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54211&view=rev
Author:   thebluegr
Date:     2010-11-11 19:38:32 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
SCI: Use the new CSC extension for SCI3 scripts

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-11-11 19:22:56 UTC (rev 54210)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-11-11 19:38:32 UTC (rev 54211)
@@ -117,6 +117,9 @@
 	"chunk", "macibin", "macibis", "macpict"
 };
 
+// Resource type suffixes. Note that the
+// suffic of SCI3 scripts has been changed from
+// scr to csc
 static const char *s_resourceTypeSuffixes[] = {
 	"v56", "p56", "scr", "tex", "snd",
 	   "", "voc", "fon", "cur", "pat",
@@ -1438,8 +1441,10 @@
 	ResourceSource *psrcPatch;
 
 	for (int i = kResourceTypeView; i < kResourceTypeInvalid; ++i) {
+		const char *suffix = (getSciVersion() == SCI_VERSION_3 && i == kResourceTypeScript) ? "csc" : s_resourceTypeSuffixes[i];
+
 		// Ignore the types that can't be patched (and Robot/VMD is handled externally for now)
-		if (!s_resourceTypeSuffixes[i] || i == kResourceTypeRobot || i == kResourceTypeVMD)
+		if (!suffix || i == kResourceTypeRobot || i == kResourceTypeVMD)
 			continue;
 
 		files.clear();
@@ -1450,7 +1455,7 @@
 		SearchMan.listMatchingMembers(files, mask);
 		// SCI1 and later naming - nnn.typ
 		mask = "*.";
-		mask += s_resourceTypeSuffixes[i];
+		mask += suffix;
 		SearchMan.listMatchingMembers(files, mask);
 
 		for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); ++x) {


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