[Scummvm-git-logs] scummvm master -> 3a93ac8ccbf906d36e474718ffebc96f908e34a2

[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:
3a93ac8ccb PHOENIXVR: Look for startup scripts in install directories


Commit: 3a93ac8ccbf906d36e474718ffebc96f908e34a2
    https://github.com/scummvm/scummvm/commit/3a93ac8ccbf906d36e474718ffebc96f908e34a2
Author: Scorp (scorp at mrs.mn)
Date: 2026-07-18T14:35:35+03:00

Commit Message:
PHOENIXVR: Look for startup scripts in install directories

Changed paths:
    engines/phoenixvr/phoenixvr.cpp


diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index 2ee40ec106e..19bb255a8c8 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -387,9 +387,20 @@ Common::SeekableReadStream *PhoenixVREngine::tryOpen(const Common::Path &name, C
 
 Common::SeekableReadStream *PhoenixVREngine::open(const Common::String &filename, Common::String *origName) {
 	debug("open %s", filename.c_str());
-	auto *stream = tryOpen(_currentScriptPath.append(filename, '\\').normalize(), origName);
-	if (stream)
-		return stream;
+	Common::SeekableReadStream *stream = nullptr;
+
+	if (!_currentScriptPath.empty()) {
+		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;
+		}
+	}
 
 	stream = tryOpen(Common::Path{filename}, origName);
 	if (stream)