qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-05-30 17:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor bugfixes.

Browse source
This commit is contained in:
Anton E. Gavrilov 2000-04-01 22:49:07 +00:00
parent 2e2377eebc
commit 3b6fa457e8
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/console.c
View file

@ -152,6 +152,9 @@ Con_MessageMode_f
*/ */
void Con_MessageMode_f (void) void Con_MessageMode_f (void)
{ {
if (cls.state != ca_active)
return;
chat_team = false; chat_team = false;
key_dest = key_message; key_dest = key_message;
} }
@ -163,6 +166,9 @@ Con_MessageMode2_f
*/ */
void Con_MessageMode2_f (void) void Con_MessageMode2_f (void)
{ {
if (cls.state != ca_active)
return;
chat_team = true; chat_team = true;
key_dest = key_message; key_dest = key_message;
} }

6
common/keys.c
View file

@ -762,7 +762,6 @@ void Key_Init (void)
keyshift['\\'] = '|'; keyshift['\\'] = '|';
menubound[K_ESCAPE] = true; menubound[K_ESCAPE] = true;
menubound['~'] = true; // Tonik
for (i=0 ; i<12 ; i++) for (i=0 ; i<12 ; i++)
menubound[K_F1+i] = true; menubound[K_F1+i] = true;
@ -824,6 +823,9 @@ void Key_Event (int key, qboolean down)
if (key == K_CTRL) if (key == K_CTRL)
ctrl_down = down; ctrl_down = down;
if (key_dest == key_message && cls.state != ca_active)
key_dest = key_console;
// //
// handle escape specialy, so the user can never unbind it // handle escape specialy, so the user can never unbind it
// //
@ -880,7 +882,7 @@ void Key_Event (int key, qboolean down)
// during demo playback, most keys bring up the main menu // during demo playback, most keys bring up the main menu
// //
if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game
&& key != K_CTRL && key != K_DEL && key != K_HOME && key != K_END) && key != K_CTRL && key != K_DEL && key != K_HOME && key != K_END && key != K_TAB)
{ {
M_ToggleMenu_f (); M_ToggleMenu_f ();
return; return;