fixed bug where keybinds dont update until refresh

Spentine · Jul 27, 2024 · 9e63a72 · 9e63a72
1 parent c835600
commit 9e63a72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/input.js b/input.js
@@ -1,16 +1,20 @@
 class InputHandler {
   constructor(keyMap) {
-    this.keyMap = keyMap;
     this.directInterface = {}; // direct layer from input
     this.inputs = {}; // reformats direct layer to be usable
-    this.keyMapKeys = Object.keys(this.keyMap); // all keys
+    this.changeInputs(keyMap);
 
     for (let i in this.keyMapKeys) {
       this.directInterface[this.keyMapKeys[i]] = null;
       this.inputs[keyMap[this.keyMapKeys[i]]] = null;
     }
   }
 
+  changeInputs(keyMap) {
+    this.keyMap = keyMap;
+    this.keyMapKeys = Object.keys(this.keyMap); // all keys
+  }
+
   keyDown(e) {
     if (!e.repeat) { // this function will also be called bc of built-in key ARR
       this.directInterface[e.code] = Date.now(); // the code for the keyDown is here
@@ -41,6 +45,7 @@ class InputHandler {
         }
       }
     }
+
     return this.inputs;
   }
 }

diff --git a/main.js b/main.js
@@ -102,6 +102,9 @@ function DOMLoaded(event) {
     startGame(data);
     renderer.updateScene(scene);
   }
+  renderer.updateKeybindInputs = function() {
+    inputHandler.changeInputs(userSettings.inGame.keyMappings);
+  }
   renderer.saveBlockStackerStorage = saveBlockStackerStorage;
 
   const UIStartElement = document.getElementById('UI-play');
@@ -199,7 +202,7 @@ function DOMLoaded(event) {
     renderer.updateKeybindButtons();
 
     saveBlockStackerStorage();
-    renderer.updateHandlingInputs();
+    inputHandler.changeInputs(userSettings.inGame.keyMappings);
   });
 
   const UIHandlingElement = document.getElementById('UI-handling');
@@ -220,7 +223,7 @@ function DOMLoaded(event) {
     userSettings.inGame.handling = defaultUserSettings.inGame.handling;
 
     saveBlockStackerStorage();
-    renderer.updateHandlingInputs();
+    inputHandler.changeInputs(userSettings.inGame.keyMappings);
   });
 
   const trainingPackInput = document.getElementById('UI-trainingPackInput');

diff --git a/render.js b/render.js
@@ -430,6 +430,7 @@ class GameRenderer {
     this.uiScaling = 1;
     this.persistentEffects = {};
     this.saveBlockStackerStorage = function() {}
+    this.updateKeybindInputs = function() {};
     this.startGame = null;
     this.pendingKeydown = {
       "keybind": [],
@@ -578,6 +579,7 @@ class GameRenderer {
       keyButton.addEventListener("click", () => {
         delete this.userSettings.inGame.keyMappings[allKeys[keyIndex]];
         this.saveBlockStackerStorage();
+        this.updateKeybindInputs();
         this.updateKeybindButtons();
       });
     }
@@ -615,6 +617,7 @@ class GameRenderer {
           if (active && !e.repeat) {
             this.userSettings.inGame.keyMappings[e.code] = currentAction;
             this.saveBlockStackerStorage();
+            this.updateKeybindInputs();
             this.updateKeybindButtons();
             active = false;
           }