diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp index 79eafd19..200eb46c 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -82,27 +82,19 @@ GameEngine::GameEngine() { } } - this->context = Ship::Context::CreateUninitializedInstance("Starship", "ship", "starship.cfg.json"); - - this->context->InitLogging(); - this->context->InitConfiguration(); - this->context->InitConsoleVariables(); + + this->context->InitConfiguration(); // without this line InitConsoleVariables fails at Config::Reload() + this->context->InitConsoleVariables(); // without this line the controldeck constructor failes in ShipDeviceIndexMappingManager::UpdateControllerNamesFromConfig() auto controlDeck = std::make_shared(); - this->context->InitResourceManager(OTRFiles, {}, 3); - this->context->InitControlDeck(controlDeck); - this->context->InitCrashHandler(); - this->context->InitConsole(); + this->context->InitResourceManager(OTRFiles, {}, 3); // without this line InitWindow fails in Gui::Init() + this->context->InitConsole(); // without this line the GuiWindow constructor fails in ConsoleWindow::InitElement() auto window = std::make_shared(std::vector>({})); - this->context->InitWindow(window); - this->context->InitAudio({ 44100, 1024*2, 2480*2 }); - this->context->InitGfxDebugger(); - this->context->Init(OTRFiles, {}, 3, { 44100, 1024*2, 2480*2 }, window, controlDeck); Ship::Context::GetInstance()->GetLogger()->set_level((spdlog::level::level_enum)CVarGetInteger("gDeveloperTools.LogLevel", 1));