ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Implement loading rsrc XObjects

Browse Source 
Xobject files on mac can contain multiple XObjects.
Parse the names of XCOD and XCMD resources and try to load them as
XObjects.
This commit is contained in:
Roland van Laar
2022-03-06 11:07:35 +01:00
parent c5fc150cd5
commit 930d9236b8
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/director/lingo/lingo-builtins.cpp
+30 -1
View File
@@ -1137,9 +1137,38 @@ void LB::b_openResFile(int nargs) {
void LB::b_openXlib(int nargs) {
// TODO: When Xtras are implemented, determine whether to initialize
// the XObject or Xtra version of FileIO
Common::String xlibName;
Datum d = g_lingo->pop();
Common::String xlibName = d.asString();
if (g_director->getPlatform() == Common::kPlatformMacintosh) {
// try opening the file as a resfile
Common::String resPath = g_director->getCurrentWindow()->getCurrentPath() + d.asString();
if (!g_director->_openResFiles.contains(resPath)) {
MacArchive *resFile = new MacArchive();
if (resFile->openFile(pathMakeRelative(resPath))) {
g_director->_openResFiles.setVal(resPath, resFile);
uint32 XCOD = MKTAG('X', 'C', 'O', 'D');
uint32 XCMD = MKTAG('X', 'C', 'M', 'D');
Common::Array<uint16> rsrcList = resFile->getResourceIDList(XCOD);
for (uint i = 0; i < rsrcList.size(); i++) {
xlibName = resFile->getResourceDetail(XCOD, rsrcList[i]).name.c_str();
g_lingo->openXLib(xlibName, kXObj);
}
rsrcList = resFile->getResourceIDList(XCMD);
for (uint i = 0; i < rsrcList.size(); i++) {
xlibName = resFile->getResourceDetail(XCMD, rsrcList[i]).name.c_str();
g_lingo->openXLib(xlibName, kXObj);
}
return;
}
}
}
xlibName = d.asString();
g_lingo->openXLib(xlibName, kXObj);
}