Fixed my two bugs with undefined externs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1909 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
4c88713050
commit
c609f340f9
2 changed files with 1 additions and 27 deletions
|
@ -342,11 +342,9 @@ int bind_grab;
|
||||||
|
|
||||||
void M_Menu_Keys_f (void)
|
void M_Menu_Keys_f (void)
|
||||||
{
|
{
|
||||||
extern cvar_t temp1;
|
|
||||||
int y;
|
int y;
|
||||||
menu_t *menu;
|
menu_t *menu;
|
||||||
if (temp1.value)
|
|
||||||
{
|
|
||||||
key_dest = key_menu;
|
key_dest = key_menu;
|
||||||
m_state = m_complex;
|
m_state = m_complex;
|
||||||
|
|
||||||
|
@ -370,28 +368,6 @@ if (temp1.value)
|
||||||
bindnames++;
|
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)
|
void M_FindKeysForCommand (char *command, int *twokeys)
|
||||||
|
|
|
@ -97,8 +97,6 @@ qboolean Q1BSP_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f,
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
if (node->children[0] == node->children[1])
|
|
||||||
Host_Error("node child[0] == node child[1]\n");
|
|
||||||
if (t1 >= 0 && t2 >= 0)
|
if (t1 >= 0 && t2 >= 0)
|
||||||
return Q1BSP_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2, trace);
|
return Q1BSP_RecursiveHullCheck (hull, node->children[0], p1f, p2f, p1, p2, trace);
|
||||||
if (t1 < 0 && t2 < 0)
|
if (t1 < 0 && t2 < 0)
|
||||||
|
|
Loading…
Reference in a new issue