github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:Malkierian/Shipwright into preset-manager

Browse source
This commit is contained in:
Malkierian 2025-05-21 11:31:27 -07:00
commit ff9575ac12
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/OTRGlobals.cpp
View file

@ -272,7 +272,7 @@ OTRGlobals::OTRGlobals() {
if (std::filesystem::exists(ootPath)) { if (std::filesystem::exists(ootPath)) {
OTRFiles.push_back(ootPath); OTRFiles.push_back(ootPath);
} }
std::string sohOtrPath = Ship::Context::GetPathRelativeToAppBundle("soh.otr"); std::string sohOtrPath = Ship::Context::LocateFileAcrossAppDirs("soh.otr");
if (std::filesystem::exists(sohOtrPath)) { if (std::filesystem::exists(sohOtrPath)) {
OTRFiles.push_back(sohOtrPath); OTRFiles.push_back(sohOtrPath);
} }
@ -1153,7 +1153,7 @@ extern "C" void InitOTR() {
CheckAndCreateModFolder(); CheckAndCreateModFolder();
#endif #endif
CheckSoHOTRVersion(Ship::Context::GetPathRelativeToAppBundle("soh.otr")); CheckSoHOTRVersion(Ship::Context::LocateFileAcrossAppDirs("soh.otr"));
if (!std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName)) && if (!std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName)) &&
!std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot.otr", appShortName))) { !std::filesystem::exists(Ship::Context::LocateFileAcrossAppDirs("oot.otr", appShortName))) {