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

[csnover]

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

Summary:
200adb99cf SCI: Add example of KQ6 game with incorrect patches directory
9e839775b6 SCI: Add "patch" directory to search paths


Commit: 200adb99cf709d8fb0eb6269ba49fd02bfe61254
    https://github.com/scummvm/scummvm/commit/200adb99cf709d8fb0eb6269ba49fd02bfe61254
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-10T11:53:26-05:00

Commit Message:
SCI: Add example of KQ6 game with incorrect patches directory

Changed paths:
    engines/sci/sci.cpp


diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index c518948..3b732b4 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -161,7 +161,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam
 	SearchMan.addSubDirectoryMatching(gameDataDir, "VMD Folder"); // Mac VMD files
 
 	// Add the patches directory, except for KQ6CD; The patches folder in some versions of KQ6CD
-	// is for the demo of Phantasmagoria, included in the disk
+	// (e.g. KQ Collection 1997) is for the demo of Phantasmagoria, included in the disk
 	if (_gameId != GID_KQ6)
 		SearchMan.addSubDirectoryMatching(gameDataDir, "patches");	// resource patches
 }


Commit: 9e839775b69607675aa9e7a7257611028f494bbf
    https://github.com/scummvm/scummvm/commit/9e839775b69607675aa9e7a7257611028f494bbf
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-10T12:04:56-05:00

Commit Message:
SCI: Add "patch" directory to search paths

Refs Trac#9776.

Changed paths:
    engines/sci/sci.cpp


diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 3b732b4..35f35e5 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -164,6 +164,9 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam
 	// (e.g. KQ Collection 1997) is for the demo of Phantasmagoria, included in the disk
 	if (_gameId != GID_KQ6)
 		SearchMan.addSubDirectoryMatching(gameDataDir, "patches");	// resource patches
+
+	// Some releases (e.g. Pointsoft Torin) use a different patch directory name
+	SearchMan.addSubDirectoryMatching(gameDataDir, "patch");	// resource patches
 }
 
 SciEngine::~SciEngine() {