[Scummvm-git-logs] scummvm master -> 6c7d39618fdfbcb0bf68ab979072cd410b615ff9

sluicebox 22204938+sluicebox at users.noreply.github.com
Mon Apr 13 00:46:06 UTC 2020


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:
6c7d39618f SCI32: Fix loading Mac Sync36 resources


Commit: 6c7d39618fdfbcb0bf68ab979072cd410b615ff9
    https://github.com/scummvm/scummvm/commit/6c7d39618fdfbcb0bf68ab979072cd410b615ff9
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-04-12T17:44:01-07:00

Commit Message:
SCI32: Fix loading Mac Sync36 resources

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 1f7413979e..74154a3928 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2073,7 +2073,10 @@ void MacResourceForkResourceSource::scanSource(ResourceManager *resMan) {
 				Common::String resourceName = _macResMan->getResName(tagArray[i], idArray[j]);
 
 				// Same as with audio36 above
-				if (!resourceName.empty() && resourceName[0] == '#')
+				if (!resourceName.empty() && 
+					(resourceName[0] == '#' || 
+					 resourceName[0] == 'S' || // Most SCI32 games
+					 resourceName[0] == 'T'))  // Torin syncs start with T or S
 					resId = convertPatchNameBase36(kResourceTypeSync36, resourceName);
 				else
 					resId = ResourceId(type, idArray[j]);




More information about the Scummvm-git-logs mailing list