BUGFIX: Fix L=A by comparing the rawkeys to the previous keyinput ins…

…tead of the converted keys Also remap newAndRepeatedKeys
pret · Oct 8, 2024 · 9c1a90e · 9c1a90e
1 parent 9a24c03
commit 9c1a90e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main.c b/src/main.c
@@ -258,11 +258,13 @@ static void ReadKeys(void)
     // because it compares the raw key input with the remapped held keys.
     // Note that newAndRepeatedKeys is never remapped either.
 
+#ifdef BUGFIX
+    if (keyInput != 0 && gMain.heldKeysRaw == keyInput)
+#else
     if (keyInput != 0 && gMain.heldKeys == keyInput)
+#endif
     {
-        gMain.keyRepeatCounter--;
-
-        if (gMain.keyRepeatCounter == 0)
+        if (--gMain.keyRepeatCounter == 0)
         {
             gMain.newAndRepeatedKeys = keyInput;
             gMain.keyRepeatCounter = gKeyRepeatContinueDelay;
@@ -285,6 +287,10 @@ static void ReadKeys(void)
 
         if (JOY_HELD(L_BUTTON))
             gMain.heldKeys |= A_BUTTON;
+#ifdef BUGFIX
+        if (JOY_REPEAT(L_BUTTON))
+            gMain.newAndRepeatedKeys |= A_BUTTON;
+#endif
     }
 
     if (JOY_NEW(gMain.watchedKeysMask))