diff --git a/engine/client/menu.c b/engine/client/menu.c index ce3849ed5..3146330fc 100644 --- a/engine/client/menu.c +++ b/engine/client/menu.c @@ -342,11 +342,9 @@ int bind_grab; void M_Menu_Keys_f (void) { - extern cvar_t temp1; int y; menu_t *menu; -if (temp1.value) -{ + key_dest = key_menu; m_state = m_complex; @@ -370,28 +368,6 @@ if (temp1.value) bindnames++; } } -else -{ - key_dest = key_menu; - m_state = m_keys; - -#ifdef Q2CLIENT - if (cls.protocol == CP_QUAKE2) - bindnames = q2bindnames; - else -#endif - bindnames = qwbindnames; - - for (numbindnames=0 ; ; numbindnames++) - { - if (!bindnames[numbindnames].command) - break; - } - - if (keys_cursor >= numbindnames) - keys_cursor = 0; -} -} void M_FindKeysForCommand (char *command, int *twokeys) diff --git a/engine/common/q1bsp.c b/engine/common/q1bsp.c index 0da9c7907..308024c39 100644 --- a/engine/common/q1bsp.c +++ b/engine/common/q1bsp.c @@ -97,8 +97,6 @@ qboolean Q1BSP_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, } #if 1 - if (node->children[0] == node->children[1]) - Host_Error("node child[0] == node child[1]\n"); if (t1 >= 0 && t2 >= 0) return Q1BSP_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2, trace); if (t1 < 0 && t2 < 0)