Merge branch 'main' into particles-first

2024-11-03 12:29:54 +03:00
parent 082a87db4e 315b4b44e1
commit 20a305fb02
9 changed files with 37 additions and 22 deletions
@@ -37,7 +37,7 @@ LevelScreen::LevelScreen(Engine* engine, std::unique_ptr<Level> level)
    auto menu = engine->getGUI()->getMenu();
    menu->reset();

-    controller = std::make_unique<LevelController>(settings, std::move(level));
+    controller = std::make_unique<LevelController>(engine, std::move(level));
    frontend = std::make_unique<LevelFrontend>(controller->getPlayer(), controller.get(), assets);

    worldRenderer = std::make_unique<WorldRenderer>(engine, frontend.get(), controller->getPlayer());