libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 03:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: revert changes to openResFile

Browse Source 
In 6e47994fc793f122768565185b1d6c6052aca2d9, openResFile was changed
to use the new `openArchive` method. However, that method tries to
treat the file as a Director archive and it may not be. This broke,
for example, loading external cursors via `openResFile`. This reverts
to the previous behaviour.
This commit is contained in:
Misty De Meo 2023-06-08 20:38:49 -07:00 committed by Misty De Méo
parent a4856ca1ba
commit d814ddda90
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/director/lingo/lingo-builtins.cpp
View File

@ -1240,13 +1240,19 @@ void LB::b_openDA(int nargs) {
void LB::b_openResFile(int nargs) {
Datum d = g_lingo->pop();
Common::String resPath = g_director->getCurrentWindow()->getCurrentPath() + d.asString();
resPath = pathMakeRelative(resPath);
if (g_director->getPlatform() == Common::kPlatformWindows) {
warning("STUB: BUILDBOT: b_openResFile(%s) on Windows", d.asString().c_str());
return;
}
if (!g_director->_allOpenResFiles.contains(resPath)) {
Archive *arch = g_director->openArchive(resPath);
if (arch) {
// Track responsibility. closeResFile may only close resource files opened by openResFile.
MacArchive *arch = new MacArchive();
if (arch->openFile(pathMakeRelative(resPath))) {
g_director->_openResFiles.setVal(resPath, arch);
g_director->_allOpenResFiles.setVal(resPath, arch);
} else {
delete arch;
}
}
}