Rename M_KeyBinding to M_WaitingForKeyBinding

andrei-drexler · Aug 31, 2024 · c9ca0e6 · c9ca0e6
1 parent 01bca6c
commit c9ca0e6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Quake/keys.c b/Quake/keys.c
@@ -1314,7 +1314,7 @@ void Key_EventWithKeycode (int key, qboolean down, int keycode)
 	}
 
 // if not a consolekey, send to the interpreter no matter what mode is
-	if ((key_dest == key_menu && menubound[key] && !M_KeyBinding ()) ||
+	if ((key_dest == key_menu && menubound[key] && !M_WaitingForKeyBinding ()) ||
 	    (key_dest == key_console && !consolekeys[key]) ||
 	    (key_dest == key_game && (!con_forcedup || !consolekeys[key])))
 	{

diff --git a/Quake/menu.c b/Quake/menu.c
@@ -7125,7 +7125,7 @@ textmode_t M_TextEntry (void)
 }
 
 
-qboolean M_KeyBinding (void)
+qboolean M_WaitingForKeyBinding (void)
 {
 	return key_dest == key_menu && m_state == m_keys && bind_grab;
 }

diff --git a/Quake/menu.h b/Quake/menu.h
@@ -62,7 +62,7 @@ void M_Keydown (int key);
 void M_Charinput (int key);
 void M_Mousemove (int x, int y);
 enum textmode_t M_TextEntry (void);
-qboolean M_KeyBinding (void);
+qboolean M_WaitingForKeyBinding (void);
 void M_ToggleMenu_f (void);
 
 void M_RefreshMods (void);

diff --git a/Quake/sys_sdl_win.c b/Quake/sys_sdl_win.c
@@ -791,7 +791,7 @@ LRESULT CALLBACK KeyFilter (int nCode, WPARAM wParam, LPARAM lParam)
 			qboolean intercept =
 				force_intercept ||
 				key == HK_PRINTSCREEN ||
-				(key_dest == key_game || M_KeyBinding ())
+				(key_dest == key_game || M_WaitingForKeyBinding ())
 			;
 
 			if (intercept)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7125,7 +7125,7 @@ textmode_t M_TextEntry (void) @@
     }
-    qboolean M_KeyBinding (void)
+    qboolean M_WaitingForKeyBinding (void)
     {
     	return key_dest == key_menu && m_state == m_keys && bind_grab;
     }
@@ Expand Down @@