From d3e34741e0922d5ee306db20155118188ea014bb Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 2 Jun 2024 21:42:51 +0300
Subject: [PATCH] res/bindings.toml moved to res/config

---
 res/{ => config}/bindings.toml |  0
 src/engine.cpp                 | 22 ++++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
 rename res/{ => config}/bindings.toml (100%)

diff --git a/res/bindings.toml b/res/config/bindings.toml
similarity index 100%
rename from res/bindings.toml
rename to res/config/bindings.toml
diff --git a/src/engine.cpp b/src/engine.cpp
index fa34c3c7..4df8a123 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -252,6 +252,16 @@ void Engine::loadAssets() {
     assets.reset(new_assets.release());
 }
 
+static void load_configs(const fs::path& root) {
+    auto configFolder = root/fs::path("config");
+    auto bindsFile = configFolder/fs::path("bindings.toml");
+    if (fs::is_regular_file(bindsFile)) {
+        Events::loadBindingsToml(
+            bindsFile.u8string(), files::read_string(bindsFile)
+        );
+    }
+}
+
 void Engine::loadContent() {
     auto resdir = paths->getResources();
     ContentBuilder contentBuilder;
@@ -274,14 +284,10 @@ void Engine::loadContent() {
         ContentLoader loader(&pack);
         loader.load(contentBuilder);
 
-        auto configFolder = pack.folder/fs::path("config");
-        auto bindsFile = configFolder/fs::path("bindings.toml");
-        if (fs::is_regular_file(bindsFile)) {
-            Events::loadBindingsToml(
-                bindsFile.u8string(), files::read_string(bindsFile)
-            );
-        }
-    }
+        load_configs(pack.folder);
+    } 
+    load_configs(paths->getResources());
+
     content = contentBuilder.build();
     resPaths = std::make_unique<ResPaths>(resdir, resRoots);