fixed handling debug keys to prevent handling keys twice

This change has two effects:

- handle debug keys before handling all other defined keys
- if debug key was processed, do not handle this key again

diff --git a/src/events.c b/src/events.c
index 0c5b2bc1354f5ad40477daa9ed5ccde37b3ff689..6fee5bbce8684de0badc8642ca52a9bfeeb76e68 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -1778,11 +1778,14 @@ static void HandleKeysSpecial(Key key)
   }
 }
 
-void HandleKeysDebug(Key key)
+boolean HandleKeysDebug(Key key, int key_status)
 {
 #ifdef DEBUG
   int i;
 
+  if (key_status != KEY_PRESSED)
+    return FALSE;
+
   if (game_status == GAME_MODE_PLAYING || !setup.debug.frame_delay_game_only)
   {
     boolean mod_key_pressed = ((GetKeyModState() & KMOD_Valid) != KMOD_None);
@@ -1809,7 +1812,7 @@ void HandleKeysDebug(Key key)
        else
          Error(ERR_DEBUG, "frame delay == 0 ms (maximum speed)");
 
-       break;
+       return TRUE;
       }
     }
   }
@@ -1822,13 +1825,19 @@ void HandleKeysDebug(Key key)
 
       Error(ERR_DEBUG, "debug mode %s",
            (options.debug ? "enabled" : "disabled"));
+
+      return TRUE;
     }
     else if (key == KSYM_v)
     {
       Error(ERR_DEBUG, "currently using game engine version %d",
            game.engine_version);
+
+      return TRUE;
     }
   }
+
+  return FALSE;
 #endif
 }
 
@@ -1856,6 +1865,9 @@ void HandleKey(Key key, int key_status)
   int joy = 0;
   int i;
 
+  if (HandleKeysDebug(key, key_status))
+    return;            // do not handle already processed keys again
+
   // map special keys (media keys / remote control buttons) to default keys
   if (key == KSYM_PlayPause)
     key = KSYM_space;
@@ -2198,8 +2210,6 @@ void HandleKey(Key key, int key_status)
        return;
       }
   }
-
-  HandleKeysDebug(key);
 }
 
 void HandleNoEvent(void)

diff --git a/src/events.h b/src/events.h
index 47a86c5673aa073d34bfb9402ea217d99a04f833..93504eb92259f85949b5e82e8cff6c617d66486b 100644 (file)
--- a/src/events.h
+++ b/src/events.h
@@ -31,7 +31,7 @@ void HandleWindowEvent(WindowEvent *);
 void HandleFingerEvent(FingerEvent *);
 void HandleTextEvent(TextEvent *);
 void HandlePauseResumeEvent(PauseResumeEvent *);
-void HandleKeysDebug(Key);
+boolean HandleKeysDebug(Key, int);
 void HandleKeyEvent(KeyEvent *);
 void HandleFocusEvent(FocusChangeEvent *);
 void HandleClientMessageEvent(ClientMessageEvent *);

diff --git a/src/tools.c b/src/tools.c
index 7e6424f8e6bb9c2c6d4f0834e15160b10438f1b8..451ef014e103daaac8476837e92bb5412d49bb56 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -4387,7 +4387,7 @@ static int RequestHandleEvents(unsigned int req_state)
                break;
 
              default:
-               HandleKeysDebug(key);
+               HandleKeysDebug(key, KEY_PRESSED);
                break;
            }