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

[dreammaster]

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

Summary:
aa33d5f720 COMMON: Fix World of Xeen crashing when run from command line


Commit: aa33d5f7201bf90832a341b0afdf9e613b88a1c9
    https://github.com/scummvm/scummvm/commit/aa33d5f7201bf90832a341b0afdf9e613b88a1c9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-10T09:36:26-08:00

Commit Message:
COMMON: Fix World of Xeen crashing when run from command line

Fixes bug #15079
When run from the command line, the engine starts up and hooks
in the mm.dat data archive. Then when the debugger console is
created, it only then iterates through all the archives for
theme files. The problem was that there was an assert in the
archive class to prevent engines using data from the wrong
subfolder in cases like the MM engine which has multiple games.
So the themes code triggered that by iterating over all the files.

When the game was run from the GUI this wasn't triggered, because
theme files had already been loaded for the launcher prior to the
game starting.

Changed paths:
    common/engine_data.cpp


diff --git a/common/engine_data.cpp b/common/engine_data.cpp
index 4b11c163201..a533a24eede 100644
--- a/common/engine_data.cpp
+++ b/common/engine_data.cpp
@@ -48,7 +48,6 @@ public:
 	}
 	Common::Path getPathInArchive() const override {
 		Common::Path name = _member->getPathInArchive();
-		assert(name.isRelativeTo(_innerfolder));
 		return _publicFolder.join(name.relativeTo(_innerfolder));
 	}
 	Common::U32String getDisplayName() const override {