[Scummvm-git-logs] scummvm master -> 2bb07fae34988c681b6564b764083d1f8c54b6b3

[Scorpeg]

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

Summary:
2bb07fae34 PHOENIXVR: Improve fallback path lookup


Commit: 2bb07fae34988c681b6564b764083d1f8c54b6b3
    https://github.com/scummvm/scummvm/commit/2bb07fae34988c681b6564b764083d1f8c54b6b3
Author: Scorp (scorp at mrs.mn)
Date: 2026-07-18T21:32:10+03:00

Commit Message:
PHOENIXVR: Improve fallback path lookup

Changed paths:
    engines/phoenixvr/phoenixvr.cpp


diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index eb26efa1ce7..9c68fba07a3 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -23,6 +23,7 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/wave.h"
 #include "audio/mixer.h"
+#include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "common/file.h"
@@ -363,6 +364,10 @@ Common::String PhoenixVREngine::removeDrive(const Common::String &path) {
 		return path.substr(2);
 }
 
+static bool isSimpleFilename(const Common::String &filename) {
+	return !filename.contains('/') && !filename.contains('\\');
+}
+
 Common::SeekableReadStream *PhoenixVREngine::tryOpen(const Common::Path &name, Common::String *origName) {
 	Common::ScopedPtr<Common::File> s(new Common::File());
 	if (s->open(name)) {
@@ -393,13 +398,16 @@ Common::SeekableReadStream *PhoenixVREngine::open(const Common::String &filename
 		stream = tryOpen(_currentScriptPath.append(filename, '\\').normalize(), origName);
 		if (stream)
 			return stream;
-	} else if (!filename.contains('/') && !filename.contains('\\') &&
-			   (filename.hasSuffixIgnoreCase(".lst") || filename.hasSuffixIgnoreCase(".pak"))) {
-		for (const char *dir : {"cd1/Install", "Install"}) {
-			stream = tryOpen(Common::Path(Common::String::format("%s/%s", dir, filename.c_str()), '/'), origName);
-			if (stream)
-				return stream;
-		}
+	}
+
+	if (isSimpleFilename(filename)) {
+		stream = tryOpen(Common::Path(Common::String::format("cd1/Install/%s", filename.c_str()), '/'), origName);
+		if (stream)
+			return stream;
+
+		stream = tryOpen(Common::Path(Common::String::format("Install/%s", filename.c_str()), '/'), origName);
+		if (stream)
+			return stream;
 	}
 
 	stream = tryOpen(Common::Path{filename}, origName);
@@ -1600,6 +1608,9 @@ Common::Error PhoenixVREngine::run() {
 	if (_pixelFormat.isCLUT8())
 		return Common::kUnsupportedColorMode;
 
+	const Common::FSNode gameDataDir(ConfMan.getPath("path"));
+	SearchMan.addDirectory(gameDataDir, 0, 4);
+
 	_arn.reset(ARN::create());
 #ifdef USE_FREETYPE2
 	static const Common::String regular("NotoSans-Regular.ttf");