This commit is contained in:
MihailRis 2025-03-21 10:05:44 +03:00
parent e442402e43
commit f99d909f34
9 changed files with 19 additions and 46 deletions

View file

@ -13,7 +13,6 @@
#include "coders/json.hpp"
#include "coders/toml.hpp"
#include "coders/commons.hpp"
#include "content/Content.hpp"
#include "content/ContentControl.hpp"
#include "core_defs.hpp"
#include "io/io.hpp"
@ -322,20 +321,6 @@ void Engine::loadAssets() {
}
}
void Engine::loadContent() {
content->loadContent();
}
void Engine::resetContent() {
paths.setCurrentWorldFolder("");
content->resetContent();
}
void Engine::loadWorldContent(const io::path& folder) {
paths.setCurrentWorldFolder(folder);
content->loadContent(ContentPack::worldPacksList("world:"));
}
void Engine::setScreen(std::shared_ptr<Screen> screen) {
// reset audio channels (stop all sources)
audio::reset_channel(audio::get_channel_index("regular"));

View file

@ -4,9 +4,6 @@
#include "typedefs.hpp"
#include "settings.hpp"
#include "content/content_fwd.hpp"
#include "content/ContentPack.hpp"
#include "content/PacksManager.hpp"
#include "io/engine_paths.hpp"
#include "io/settings_io.hpp"
#include "util/ObjectsKeeper.hpp"
@ -15,7 +12,6 @@
#include <memory>
#include <string>
#include <vector>
class Window;
class Assets;
@ -114,17 +110,6 @@ public:
/// @param locale isolanguage_ISOCOUNTRY (example: en_US)
void setLanguage(std::string locale);
/// @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
/// @see loadContent
/// @param folder world folder
void loadWorldContent(const io::path& folder);
/// @brief Get active assets storage instance
Assets* getAssets();