[Scummvm-git-logs] scummvm master -> daca56923f7d0bcae690e98acf41a2f5773d392f

[elasota]

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

Summary:
75ba135707 VCRUISE: Change default language of Netherlands English DVD release from Dutch to English
5be735b33d VCRUISE: Change missing animation warning to error
daca56923f VCRUISE: Try case variations of game subdir in DVD versions of Schizm to fix English DVD version on case-sensitive file 


Commit: 75ba135707963f7a5ce128ad326549c38e046320
    https://github.com/scummvm/scummvm/commit/75ba135707963f7a5ce128ad326549c38e046320
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-11T13:12:32-04:00

Commit Message:
VCRUISE: Change default language of Netherlands English DVD release from Dutch to English

Changed paths:
    engines/vcruise/detection_tables.h


diff --git a/engines/vcruise/detection_tables.h b/engines/vcruise/detection_tables.h
index 13b3c4a7baf..3e6ec74861d 100644
--- a/engines/vcruise/detection_tables.h
+++ b/engines/vcruise/detection_tables.h
@@ -172,7 +172,7 @@ static const VCruiseGameDescription gameDescriptions[] = {
 	},
 
 
-	{ // Schizm: Mysterious Journey, Dutch DVD Version
+	{ // Schizm: Mysterious Journey, English DVD Version (NL release)
 		{
 			"schizm",
 			"English DVD",
@@ -183,7 +183,7 @@ static const VCruiseGameDescription gameDescriptions[] = {
 			GUIO0()
 		},
 		GID_SCHIZM,
-		Common::NL_NLD,
+		Common::EN_GRB,
 	},
 	{ // Schizm: Mysterious Journey, English DVD Version
 		{


Commit: 5be735b33d79778ed54c63257de466fd7e62f305
    https://github.com/scummvm/scummvm/commit/5be735b33d79778ed54c63257de466fd7e62f305
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-11T13:52:34-04:00

Commit Message:
VCRUISE: Change missing animation warning to error

Changed paths:
    engines/vcruise/runtime.cpp


diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index 9a997ef2763..e71fbc6faaa 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -3514,7 +3514,7 @@ void Runtime::changeAnimation(const AnimationDef &animDef, uint initialFrame, bo
 				return;
 			}
 		} else {
-			warning("Animation file %i is missing", animFile);
+			error("Animation file %i is missing", animFile);
 			delete aviFile;
 		}
 


Commit: daca56923f7d0bcae690e98acf41a2f5773d392f
    https://github.com/scummvm/scummvm/commit/daca56923f7d0bcae690e98acf41a2f5773d392f
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-11T13:53:51-04:00

Commit Message:
VCRUISE: Try case variations of game subdir in DVD versions of Schizm to fix English DVD version on case-sensitive file systems

Changed paths:
    engines/vcruise/vcruise.cpp


diff --git a/engines/vcruise/vcruise.cpp b/engines/vcruise/vcruise.cpp
index 697d29fda41..9c2a4e412ea 100644
--- a/engines/vcruise/vcruise.cpp
+++ b/engines/vcruise/vcruise.cpp
@@ -342,15 +342,32 @@ void VCruiseEngine::initializePath(const Common::FSNode &gamePath) {
 	Engine::initializePath(gamePath);
 
 	const char *gameSubPath = nullptr;
+
 	if (_gameDescription->desc.flags & VCRUISE_GF_GENTEE_PACKAGE) {
 		if (_gameDescription->gameID == GID_SCHIZM)
 			gameSubPath = "Schizm";
 	}
 
 	if (gameSubPath) {
-		Common::FSNode gameSubDir = gamePath.getChild(gameSubPath);
-		if (gameSubDir.isDirectory())
-			SearchMan.addDirectory("VCruiseGameDir", gameSubDir, 0, 3);
+		const int kNumCasePasses = 3;
+
+		for (int casePass = 0; casePass < kNumCasePasses; casePass++) {
+			Common::String subPathStr(gameSubPath);
+
+			if (casePass == 1)
+				subPathStr.toUppercase();
+			else if (casePass == 2)
+				subPathStr.toLowercase();
+
+			Common::FSNode gameSubDir = gamePath.getChild(subPathStr);
+			if (gameSubDir.isDirectory()) {
+				SearchMan.addDirectory("VCruiseGameDir", gameSubDir, 0, 3);
+				break;
+			}
+
+			if (casePass != kNumCasePasses - 1)
+				warning("Expected to find subpath '%s' in the game directory but couldn't find it", gameSubPath);
+		}
 	}
 
 	_rootFSNode = gamePath;