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

[phcoder]

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:
bec73d7ec0 NEVERHOOD: Fix wrong hints in Japanese version
e095d15a37 NEVERHOOD: Fix loading nhc from <extrapath>/language


Commit: bec73d7ec0dd3f44536e5da52ed6790b6a93a4bb
    https://github.com/scummvm/scummvm/commit/bec73d7ec0dd3f44536e5da52ed6790b6a93a4bb
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-01-28T17:39:51+01:00

Commit Message:
NEVERHOOD: Fix wrong hints in Japanese version

Reported by: Rigel

Changed paths:
    engines/neverhood/modules/module1000.cpp


diff --git a/engines/neverhood/modules/module1000.cpp b/engines/neverhood/modules/module1000.cpp
index 0963aa55673..f5f3a56f509 100644
--- a/engines/neverhood/modules/module1000.cpp
+++ b/engines/neverhood/modules/module1000.cpp
@@ -609,8 +609,7 @@ void Scene1005::drawTextToBackground() {
 			uint32 image_id;
 			int x, y;
 		} jp_images[] = {
-			/* default */ { 0xB1048044, 205, 39 },
-			/* default */ { 0xB1048044, 205, 39 },
+			/* 1 */ { 0xB1048044, 205, 39 },
 			/* 2 */ { 0x31048045, 201, 54 },
 			/* 3 */ { 0x31048046, 193, 37 },
 			/* 4 */ { 0x31048040, 192, 57 },


Commit: e095d15a37d98408f5a626300e66408191b95d76
    https://github.com/scummvm/scummvm/commit/e095d15a37d98408f5a626300e66408191b95d76
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-01-28T17:39:56+01:00

Commit Message:
NEVERHOOD: Fix loading nhc from <extrapath>/language

Changed paths:
    engines/neverhood/neverhood.cpp


diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index eb20ae8e88e..aaaf72a7ce6 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -68,10 +68,17 @@ Common::Error NeverhoodEngine::run() {
 	initGraphics(640, 480);
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
+	const Common::String extraPath(ConfMan.get("extrapath"));
 
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "language");
 
+	if(!extraPath.empty()) {
+		const Common::FSNode extraDir(extraPath);
+		SearchMan.addSubDirectoryMatching(extraDir, "data");
+		SearchMan.addSubDirectoryMatching(extraDir, "language");
+	}
+
 	_isSaveAllowed = false;
 
 	_mouseX = 0;