diff --git a/libultraship/Archive.cpp b/libultraship/Archive.cpp index fb4890c..ac40ad3 100644 --- a/libultraship/Archive.cpp +++ b/libultraship/Archive.cpp @@ -448,12 +448,12 @@ namespace Ship { } for (int j = i; j < OTRFiles.size(); j++) { #ifdef _WIN32 - std::wstring wfullPath = std::filesystem::absolute(OTRFiles[i]).wstring(); + std::wstring wfullPath = std::filesystem::absolute(OTRFiles[j]).wstring(); #endif #if defined(__SWITCH__) std::string fullPath = OTRFiles[i]; #else - std::string fullPath = std::filesystem::absolute(OTRFiles[i]).string(); + std::string fullPath = std::filesystem::absolute(OTRFiles[j]).string(); #endif if (LoadPatchMPQ(fullPath, true)) { @@ -493,8 +493,7 @@ namespace Ship { // i.e. Ocarina of Time along with Master Quest. if (validateVersion) { if (!PushGameVersion(patchHandle)) { - SPDLOG_WARN("({}) Invalid MQP file.", path.c_str()); - return false; + SPDLOG_INFO("({}) Missing version file. Attempting to apply patch anyway.", path.c_str()); } } } diff --git a/libultraship/WiiUImpl.cpp b/libultraship/WiiUImpl.cpp index 4143954..68e3e58 100644 --- a/libultraship/WiiUImpl.cpp +++ b/libultraship/WiiUImpl.cpp @@ -77,6 +77,10 @@ void ThrowMissingOTR(const char* otrPath) { OSFatal("Main OTR file not found!"); } +void ThrowInvalidOTR() { + OSFatal("Invalid OTR files! Try regenerating them!"); +} + void Update() { bool rescan = false; diff --git a/libultraship/WiiUImpl.h b/libultraship/WiiUImpl.h index 8c8e64b..fe5d42f 100644 --- a/libultraship/WiiUImpl.h +++ b/libultraship/WiiUImpl.h @@ -12,6 +12,8 @@ void Exit(); void ThrowMissingOTR(const char* otrPath); +void ThrowInvalidOTR(); + void Update(); VPADStatus *GetVPADStatus(VPADReadError *error);