cleanup ContentControl

src/engine/Engine.cpp

@@ -133,16 +133,14 @@ void Engine::initialize(CoreParameters coreParameters) {
 
     bool langNotSet = settings.ui.language.get() == "auto";
     if (langNotSet) {
-        settings.ui.language.set(langs::locale_by_envlocale(
-            platform::detect_locale(),
-            "res:"
-        ));
+        settings.ui.language.set(
+            langs::locale_by_envlocale(platform::detect_locale())
+        );
     }
     content = std::make_unique<ContentControl>(paths, *input, [this]() {
-        langs::setup("res:", langs::get_current(), paths.resPaths.collectRoots());
+        langs::setup(langs::get_current(), paths.resPaths.collectRoots());
         if (!isHeadless()) {
             loadAssets();
-            onAssetsLoaded();
         }
     });
     scripting::initialize(this);
@@ -150,7 +148,7 @@ void Engine::initialize(CoreParameters coreParameters) {
         gui->setPageLoader(scripting::create_page_loader());
     }
     keepAlive(settings.ui.language.observe([this](auto lang) {
-        setLanguage(lang);
+        langs::setup(lang, paths.resPaths.collectRoots());
     }, true));
 }
 
@@ -179,11 +177,6 @@ void Engine::loadControls() {
     }
 }
 
-void Engine::onAssetsLoaded() {
-    assets->setup();
-    gui->onAssetsLoad(assets.get());
-}
-
 void Engine::updateHotkeys() {
     if (input->jpressed(keycode::F2)) {
         saveScreenshot();
@@ -319,6 +312,9 @@ void Engine::loadAssets() {
     if (content) {
         ModelsGenerator::prepare(*content, *assets);
     }
+
+    assets->setup();
+    gui->onAssetsLoad(assets.get());
 }
 
 void Engine::setScreen(std::shared_ptr<Screen> screen) {
@@ -328,10 +324,6 @@ void Engine::setScreen(std::shared_ptr<Screen> screen) {
     this->screen = std::move(screen);
 }
 
-void Engine::setLanguage(std::string locale) {
-    langs::setup("res:", std::move(locale), paths.resPaths.collectRoots());
-}
-
 void Engine::onWorldOpen(std::unique_ptr<Level> level, int64_t localPlayer) {
     logger.info() << "world open";
     levelConsumer(std::move(level), localPlayer);

src/engine/Engine.hpp

@@ -17,12 +17,8 @@ class Window;
 class Assets;
 class Level;
 class Screen;
-class EnginePaths;
-class ResPaths;
 class ContentControl;
 class EngineController;
-class SettingsHandler;
-struct EngineSettings;
 class Input;
 
 namespace gui {
@@ -96,9 +92,6 @@ public:
     void updateFrontend();
     void renderFrame();
     void nextFrame();
-
-    /// @brief Called after assets loading when all engine systems are initialized
-    void onAssetsLoaded();
     
     /// @brief Set screen (scene).
     /// nullptr may be used to delete previous screen before creating new one,
@@ -106,10 +99,6 @@ public:
     /// @param screen nullable screen
     void setScreen(std::shared_ptr<Screen> screen);
     
-    /// @brief Change locale to specified
-    /// @param locale isolanguage_ISOCOUNTRY (example: en_US)
-    void setLanguage(std::string locale);
-
     /// @brief Get active assets storage instance
     Assets* getAssets();