diff --git a/src/content/ContentControl.cpp b/src/content/ContentControl.cpp index 5da12a1e..dea7099f 100644 --- a/src/content/ContentControl.cpp +++ b/src/content/ContentControl.cpp @@ -2,7 +2,6 @@ #include "io/io.hpp" #include "io/engine_paths.hpp" -#include "coders/toml.hpp" #include "Content.hpp" #include "ContentPack.hpp" #include "ContentBuilder.hpp" @@ -10,18 +9,10 @@ #include "PacksManager.hpp" #include "objects/rigging.hpp" #include "logic/scripting/scripting.hpp" -#include "window/input.hpp" #include "core_defs.hpp" static void load_configs(Input& input, const io::path& root) { auto configFolder = root / "config"; - auto bindsFile = configFolder / "bindings.toml"; - if (io::is_regular_file(bindsFile)) { - input.getBindings().read( - toml::parse(bindsFile.string(), io::read_string(bindsFile)), - BindType::BIND - ); - } } ContentControl::ContentControl( diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 640176b9..112ece7f 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -136,6 +136,18 @@ void Engine::initialize(CoreParameters coreParameters) { content = std::make_unique(paths, *input, [this]() { langs::setup(langs::get_current(), paths.resPaths.collectRoots()); if (!isHeadless()) { + for (auto& pack : content->getAllContentPacks()) { + auto configFolder = pack.folder / "config"; + auto bindsFile = configFolder / "bindings.toml"; + if (io::is_regular_file(bindsFile)) { + input->getBindings().read( + toml::parse( + bindsFile.string(), io::read_string(bindsFile) + ), + BindType::BIND + ); + } + } loadAssets(); } });