From 0d1c7f1a88e12a2a55e3308faf6aa5835a12d069 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 4 Jan 2025 00:07:17 +0300 Subject: [PATCH] fix Engine::resetContent in headless mode --- src/engine/Engine.cpp | 6 ++++-- src/engine/Engine.hpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 39feb2bc..c209569b 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -401,8 +401,10 @@ void Engine::resetContent() { content.reset(); langs::setup(resdir, langs::current->getId(), contentPacks); - loadAssets(); - onAssetsLoaded(); + if (!isHeadless()) { + loadAssets(); + onAssetsLoaded(); + } contentPacks = manager.getAll(basePacks); } diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index 56231928..af9f7fb9 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -108,6 +108,7 @@ public: /// @brief Load all selected content-packs and reload assets void loadContent(); + /// @brief Reset content to base packs list void resetContent(); /// @brief Collect world content-packs and load content