From d1928be97d10b34c9c17a92892eba09fa0808b1d Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Sat, 7 Oct 2023 21:38:26 -0600 Subject: [PATCH] Changed dictionary load order because it crashes on windows --- src/port/Engine.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp index 61ca11f5..79a23adc 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -54,6 +54,7 @@ GameEngine::GameEngine(){ this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SDialog, "Dialog", std::make_shared()); this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Dictionary, "Dictionary", std::make_shared()); GameEngine::AudioInit(); + this->LoadDictionary(); } void GameEngine::Create(){ @@ -168,7 +169,6 @@ void GameEngine::AudioExit() { void GameEngine::LoadDictionary() { this->dictionary = static_cast> *>(ResourceGetDataByName("__OTR__texts/strings/global")); - int bp = 0; } extern "C" uint32_t GameEngine_GetSampleRate() { @@ -267,11 +267,8 @@ extern "C" uint8_t* GameEngine_LoadTranslation(const char* key) { auto engine = GameEngine::Instance; auto dictionary = engine->dictionary; - if (dictionary == nullptr) { - engine->LoadDictionary(); - } - assert(engine->dictionary != nullptr); assert(engine->dictionary->contains(key)); + return engine->dictionary->at(key).data(); } \ No newline at end of file