diff options
| m--------- | libultraship | 0 | ||||
| -rw-r--r-- | soh/soh/Enhancements/tts/tts.cpp | 8 | ||||
| -rw-r--r-- | soh/soh/OTRGlobals.cpp | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libultraship b/libultraship -Subproject d252cc241e0ff2270a289abba274ed43bd0b179 +Subproject 60868949e62a4c4c863eb5daf883bae18387f37 diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp index ced1a7acf..9d58e2d62 100644 --- a/soh/soh/Enhancements/tts/tts.cpp +++ b/soh/soh/Enhancements/tts/tts.cpp @@ -1045,16 +1045,16 @@ void InitTTSBank() { initData->ResourceVersion = 0; sceneMap = std::static_pointer_cast<Ship::Json>( - Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/scenes" + languageSuffix, 0, true, initData))->Data; + Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/scenes" + languageSuffix, true, initData))->Data; miscMap = std::static_pointer_cast<Ship::Json>( - Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/misc" + languageSuffix, 0, true, initData))->Data; + Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/misc" + languageSuffix, true, initData))->Data; kaleidoMap = std::static_pointer_cast<Ship::Json>( - Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/kaleidoscope" + languageSuffix, 0, true, initData))->Data; + Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/kaleidoscope" + languageSuffix, true, initData))->Data; fileChooseMap = std::static_pointer_cast<Ship::Json>( - Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/filechoose" + languageSuffix, 0, true, initData))->Data; + Ship::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/filechoose" + languageSuffix, true, initData))->Data; } void RegisterOnSetGameLanguageHook() { diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index ee41d7231..25360363b 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -908,9 +908,9 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) { OTRVersion version = {}; // Use a temporary archive instance to load the otr and read the version file - auto archive = Ship::OtrArchive(otrPath); - if (archive.Open()) { - auto t = archive.LoadFile("portVersion", std::make_shared<Ship::ResourceInitData>()); + auto archive = std::make_shared<Ship::OtrArchive>(otrPath); + if (archive->Open()) { + auto t = archive->LoadFile("portVersion", std::make_shared<Ship::ResourceInitData>()); if (t != nullptr && t->IsLoaded) { auto stream = std::make_shared<Ship::MemoryStream>(t->Buffer->data(), t->Buffer->size()); auto reader = std::make_shared<Ship::BinaryReader>(stream); @@ -920,7 +920,7 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) { version.minor = reader->ReadUInt16(); version.patch = reader->ReadUInt16(); } - archive.Close(); + archive->Close(); } return version; @@ -1142,9 +1142,9 @@ extern "C" void InitOTR() { SaveManager::Instance = new SaveManager(); std::shared_ptr<Ship::Config> conf = OTRGlobals::Instance->context->GetConfig(); - conf->RegisterConfigVersionUpdater(std::make_shared<SOH::ConfigVersion1Updater>()); - conf->RegisterConfigVersionUpdater(std::make_shared<SOH::ConfigVersion2Updater>()); - conf->RegisterConfigVersionUpdater(std::make_shared<SOH::ConfigVersion3Updater>()); + conf->RegisterVersionUpdater(std::make_shared<SOH::ConfigVersion1Updater>()); + conf->RegisterVersionUpdater(std::make_shared<SOH::ConfigVersion2Updater>()); + conf->RegisterVersionUpdater(std::make_shared<SOH::ConfigVersion3Updater>()); conf->RunVersionUpdates(); SohGui::SetupGuiElements(); |