[Scummvm-git-logs] scummvm master -> 9e6ad22c2a0295b232dd7b5d67dac7a09e910cb7

sluicebox 22204938+sluicebox at users.noreply.github.com
Thu Oct 24 06:09:26 CEST 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9e6ad22c2a SCI32: Include Mac resource filenames with two digits


Commit: 9e6ad22c2a0295b232dd7b5d67dac7a09e910cb7
    https://github.com/scummvm/scummvm/commit/9e6ad22c2a0295b232dd7b5d67dac7a09e910cb7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-10-23T21:08:24-07:00

Commit Message:
SCI32: Include Mac resource filenames with two digits

KQ7, Phant1, and others have more than 9 "Data" files

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 89ab6e0..765747b 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -640,7 +640,8 @@ int ResourceManager::addAppropriateSources() {
 	} else if (Common::MacResManager::exists("Data1")) {
 		// Mac SCI1.1+ file naming scheme
 		Common::StringArray files;
-		Common::MacResManager::listFiles(files, "Data?");
+		Common::MacResManager::listFiles(files, "Data#");
+		Common::MacResManager::listFiles(files, "Data##");
 
 		for (Common::StringArray::const_iterator x = files.begin(); x != files.end(); ++x) {
 			addSource(new MacResourceForkResourceSource(*x, atoi(x->c_str() + 4)));





More information about the Scummvm-git-logs mailing list