mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 12:52:18 -05:00
Code Issues Projects Releases Wiki Activity

fix cutscenes loading wrong resource when only an mq rom is loaded (#2545)

Browse Source
This commit is contained in:
Adam Bird 2023-02-26 19:44:30 -05:00 committed by GitHub
parent 60b206140d
commit c1ddeec02a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/soh/OTRGlobals.cpp
View File

@ -1186,7 +1186,14 @@ extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path) {
}
extern "C" s32* ResourceMgr_LoadCSByName(const char* path) {
return (s32*)GetResourceDataByName(path, false);
// Handle mq vs nonmq for cutscenes due to scene/ paths
auto res = ResourceMgr_LoadResource(path);
if (res == nullptr) {
return nullptr;
}
return (s32*)res->GetPointer();
}
std::filesystem::path GetSaveFile(std::shared_ptr<Mercury> Conf) {