mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-17 22:02:19 -05:00
Code Issues Projects Releases Wiki Activity

Bump LUS (#4670)

Browse Source 
* Bump LUS

* bump LUS

* bump lus (again)

* bump LUS again
This commit is contained in:
Kenix3 2024-12-13 03:05:13 -05:00 committed by GitHub
parent 2e71a826b2
commit c7341ec544
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit d252cc241e0ff2270a289abba274ed43bd0b1792 Subproject commit 60868949e62a4c4c863eb5daf883bae18387f372

8
soh/soh/Enhancements/tts/tts.cpp
View File

@ -1045,16 +1045,16 @@ void InitTTSBank() {
initData->ResourceVersion = 0; initData->ResourceVersion = 0;
sceneMap = std::static_pointer_cast<Ship::Json>( 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>( 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>( 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>( 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() { void RegisterOnSetGameLanguageHook() {

14
soh/soh/OTRGlobals.cpp
View File

@ -908,9 +908,9 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) {
OTRVersion version = {}; OTRVersion version = {};
// Use a temporary archive instance to load the otr and read the version file // Use a temporary archive instance to load the otr and read the version file
auto archive = Ship::OtrArchive(otrPath); auto archive = std::make_shared<Ship::OtrArchive>(otrPath);
if (archive.Open()) { if (archive->Open()) {
auto t = archive.LoadFile("portVersion", std::make_shared<Ship::ResourceInitData>()); auto t = archive->LoadFile("portVersion", std::make_shared<Ship::ResourceInitData>());
if (t != nullptr && t->IsLoaded) { if (t != nullptr && t->IsLoaded) {
auto stream = std::make_shared<Ship::MemoryStream>(t->Buffer->data(), t->Buffer->size()); auto stream = std::make_shared<Ship::MemoryStream>(t->Buffer->data(), t->Buffer->size());
auto reader = std::make_shared<Ship::BinaryReader>(stream); auto reader = std::make_shared<Ship::BinaryReader>(stream);
@ -920,7 +920,7 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) {
version.minor = reader->ReadUInt16(); version.minor = reader->ReadUInt16();
version.patch = reader->ReadUInt16(); version.patch = reader->ReadUInt16();
} }
archive.Close(); archive->Close();
} }
return version; return version;
@ -1142,9 +1142,9 @@ extern "C" void InitOTR() {
SaveManager::Instance = new SaveManager(); SaveManager::Instance = new SaveManager();
std::shared_ptr<Ship::Config> conf = OTRGlobals::Instance->context->GetConfig(); std::shared_ptr<Ship::Config> conf = OTRGlobals::Instance->context->GetConfig();
conf->RegisterConfigVersionUpdater(std::make_shared<SOH::ConfigVersion1Updater>()); conf->RegisterVersionUpdater(std::make_shared<SOH::ConfigVersion1Updater>());
conf->RegisterConfigVersionUpdater(std::make_shared<SOH::ConfigVersion2Updater>()); conf->RegisterVersionUpdater(std::make_shared<SOH::ConfigVersion2Updater>());
conf->RegisterConfigVersionUpdater(std::make_shared<SOH::ConfigVersion3Updater>()); conf->RegisterVersionUpdater(std::make_shared<SOH::ConfigVersion3Updater>());
conf->RunVersionUpdates(); conf->RunVersionUpdates();
SohGui::SetupGuiElements(); SohGui::SetupGuiElements();