varies coses i detallets

source/main.cpp

@@ -11,6 +11,7 @@
 #include <ctime>
 #include <string>
 
+#include "core/input/key_config.hpp"
 #include "core/jail/jail_audio.hpp"
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jfile.hpp"
@@ -57,6 +58,10 @@ SDL_AppResult SDL_AppInit(void** /*appstate*/, int /*argc*/, char* /*argv*/[]) {
     Options::setConfigFile(std::string(file_getconfigfolder()) + "config.yaml");
     Options::loadFromFile();
 
+    // KeyConfig: defaults des de data/input/keys.yaml + overrides de l'usuari
+    KeyConfig::init("input/keys.yaml",
+        std::string(file_getconfigfolder()) + "keys.yaml");
+
 #ifndef NDEBUG
     // debug.yaml: estat inicial de gameplay per a tests ràpids,
     // només en builds de debug.
@@ -119,11 +124,13 @@ void SDL_AppQuit(void* /*appstate*/, SDL_AppResult /*result*/) {
     Director::get()->teardown();
 
     Options::saveToFile();
+    KeyConfig::saveOverrides();
 #ifndef NDEBUG
     Options::saveDebugToFile();
 #endif
 
     Director::destroy();
+    KeyConfig::destroy();
     Menu::destroy();
     Overlay::destroy();
     JA_Quit();