Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-29 06:07:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Formatted cl_keys.cpp source file

Browse source
This commit is contained in:
smallmodel 2023-12-28 17:21:02 +01:00
parent d3a4407391
commit 035de09c15
No known key found for this signature in database
GPG key ID: A96F163ED4891440
1 changed files with 900 additions and 917 deletions
Download patch file Download diff file Expand all files Collapse all files

245
code/client/cl_keys.cpp
View file

@ -37,7 +37,6 @@ qboolean chat_team;
int chat_playerNum; int chat_playerNum;
qboolean key_overstrikeMode; qboolean key_overstrikeMode;
int anykeydown; int anykeydown;
@ -56,8 +55,7 @@ typedef struct {
} keyname_t; } keyname_t;
// names not in this list can either be lowercase ascii, or '0xnn' hex sequences // names not in this list can either be lowercase ascii, or '0xnn' hex sequences
keyname_t keynames[] = keyname_t keynames[] = {
{
{"TAB", K_TAB }, {"TAB", K_TAB },
{"ENTER", K_ENTER }, {"ENTER", K_ENTER },
{"ESCAPE", K_ESCAPE }, {"ESCAPE", K_ESCAPE },
@ -76,7 +74,6 @@ keyname_t keynames[] =
{"CAPSLOCK", K_CAPSLOCK }, {"CAPSLOCK", K_CAPSLOCK },
{"F1", K_F1 }, {"F1", K_F1 },
{"F2", K_F2 }, {"F2", K_F2 },
{"F3", K_F3 }, {"F3", K_F3 },
@ -343,14 +340,14 @@ Message_Key
In game talk message In game talk message
================ ================
*/ */
void Message_Key( int key ) { void Message_Key(int key)
{
if (key == K_ESCAPE) { if (key == K_ESCAPE) {
Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_MESSAGE); Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_MESSAGE);
return; return;
} }
if ( key == K_ENTER || key == K_KP_ENTER ) if (key == K_ENTER || key == K_KP_ENTER) {
{
Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_MESSAGE); Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_MESSAGE);
return; return;
} }
@ -358,23 +355,23 @@ void Message_Key( int key ) {
//============================================================================ //============================================================================
qboolean Key_GetOverstrikeMode(void)
qboolean Key_GetOverstrikeMode( void ) { {
return key_overstrikeMode; return key_overstrikeMode;
} }
void Key_SetOverstrikeMode(qboolean state)
void Key_SetOverstrikeMode( qboolean state ) { {
key_overstrikeMode = state; key_overstrikeMode = state;
} }
/* /*
=================== ===================
Key_IsDown Key_IsDown
=================== ===================
*/ */
qboolean Key_IsDown( int keynum ) { qboolean Key_IsDown(int keynum)
{
if (keynum < 0 || keynum >= MAX_KEYS) { if (keynum < 0 || keynum >= MAX_KEYS) {
return qfalse; return qfalse;
} }
@ -382,7 +379,6 @@ qboolean Key_IsDown( int keynum ) {
return keys[keynum].down; return keys[keynum].down;
} }
/* /*
=================== ===================
Key_StringToKeynum Key_StringToKeynum
@ -396,7 +392,8 @@ the K_* names are matched up.
to be configured even if they don't have defined names. to be configured even if they don't have defined names.
=================== ===================
*/ */
int Key_StringToKeynum( const char *str ) { int Key_StringToKeynum(const char *str)
{
keyname_t *kn; keyname_t *kn;
if (!str || !str[0]) { if (!str || !str[0]) {
@ -433,9 +430,10 @@ int Key_StringToKeynum( const char *str ) {
// scan for a text match // scan for a text match
for (kn = keynames; kn->name; kn++) { for (kn = keynames; kn->name; kn++) {
if ( !Q_stricmp( str,kn->name ) ) if (!Q_stricmp(str, kn->name)) {
return kn->keynum; return kn->keynum;
} }
}
return -1; return -1;
} }
@ -448,7 +446,8 @@ Returns a string (either a single ascii char, a K_* name, or a 0x11 hex string)
given keynum. given keynum.
=================== ===================
*/ */
const char *Key_KeynumToString( int keynum ) { const char *Key_KeynumToString(int keynum)
{
keyname_t *kn; keyname_t *kn;
static char tinystr[5]; static char tinystr[5];
int i, j; int i, j;
@ -496,7 +495,8 @@ Returns a string (either a single ascii char, a K_* name, or a 0x11 hex string)
given keynum. given keynum.
=================== ===================
*/ */
const char *Key_KeynumToBindString( int keynum ) { const char *Key_KeynumToBindString(int keynum)
{
keyname_t *kn; keyname_t *kn;
static char tinystr[5]; static char tinystr[5];
@ -525,13 +525,13 @@ const char *Key_KeynumToBindString( int keynum ) {
return "Unknown Key"; return "Unknown Key";
} }
/* /*
=================== ===================
Key_SetBinding Key_SetBinding
=================== ===================
*/ */
void Key_SetBinding( int keynum, const char *binding ) { void Key_SetBinding(int keynum, const char *binding)
{
if (keynum < 0 || keynum >= MAX_KEYS) { if (keynum < 0 || keynum >= MAX_KEYS) {
return; return;
} }
@ -554,7 +554,8 @@ void Key_SetBinding( int keynum, const char *binding ) {
Key_SetAltBinding Key_SetAltBinding
=================== ===================
*/ */
void Key_SetAltBinding( int keynum, const char *binding ) { void Key_SetAltBinding(int keynum, const char *binding)
{
if (keynum < 0 || keynum >= MAX_KEYS) { if (keynum < 0 || keynum >= MAX_KEYS) {
return; return;
} }
@ -577,7 +578,8 @@ void Key_SetAltBinding( int keynum, const char *binding ) {
Key_SetCtrlBinding Key_SetCtrlBinding
=================== ===================
*/ */
void Key_SetCtrlBinding( int keynum, const char *binding ) { void Key_SetCtrlBinding(int keynum, const char *binding)
{
if (keynum < 0 || keynum >= MAX_KEYS) { if (keynum < 0 || keynum >= MAX_KEYS) {
return; return;
} }
@ -595,13 +597,13 @@ void Key_SetCtrlBinding( int keynum, const char *binding ) {
cvar_modifiedFlags |= CVAR_ARCHIVE; cvar_modifiedFlags |= CVAR_ARCHIVE;
} }
/* /*
=================== ===================
Key_GetBinding Key_GetBinding
=================== ===================
*/ */
const char *Key_GetBinding( int keynum ) { const char *Key_GetBinding(int keynum)
{
if (keynum < 0 || keynum >= MAX_KEYS) { if (keynum < 0 || keynum >= MAX_KEYS) {
return ""; return "";
} }
@ -615,7 +617,8 @@ Key_GetKey
=================== ===================
*/ */
int Key_GetKey(const char *binding) { int Key_GetKey(const char *binding)
{
int i; int i;
if (binding) { if (binding) {
@ -633,7 +636,8 @@ int Key_GetKey(const char *binding) {
Key_GetKeynameForCommand Key_GetKeynameForCommand
=================== ===================
*/ */
const char *Key_GetKeynameForCommand( const char *command ) { const char *Key_GetKeynameForCommand(const char *command)
{
int i; int i;
for (i = 0; i < MAX_KEYS; i++) { for (i = 0; i < MAX_KEYS; i++) {
@ -653,7 +657,8 @@ const char *Key_GetKeynameForCommand( const char *command ) {
Key_GetKeysForCommand Key_GetKeysForCommand
=================== ===================
*/ */
void Key_GetKeysForCommand( const char *command, int *key1, int *key2 ) { void Key_GetKeysForCommand(const char *command, int *key1, int *key2)
{
int i; int i;
*key1 = *key2 = -1; *key1 = *key2 = -1;
@ -682,15 +687,13 @@ void Key_Unbind_f (void)
{ {
int b; int b;
if (Cmd_Argc() != 2) if (Cmd_Argc() != 2) {
{
Com_Printf("unbind <key> : remove commands from a key\n"); Com_Printf("unbind <key> : remove commands from a key\n");
return; return;
} }
b = Key_StringToKeynum(Cmd_Argv(1)); b = Key_StringToKeynum(Cmd_Argv(1));
if (b==-1) if (b == -1) {
{
Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1)); Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return; return;
} }
@ -707,15 +710,13 @@ void Key_Unaltbind_f (void)
{ {
int b; int b;
if (Cmd_Argc() != 2) if (Cmd_Argc() != 2) {
{
Com_Printf("unaltbind <key> : remove commands from a key\n"); Com_Printf("unaltbind <key> : remove commands from a key\n");
return; return;
} }
b = Key_StringToKeynum(Cmd_Argv(1)); b = Key_StringToKeynum(Cmd_Argv(1));
if (b==-1) if (b == -1) {
{
Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1)); Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return; return;
} }
@ -732,15 +733,13 @@ void Key_Unctrlbind_f (void)
{ {
int b; int b;
if (Cmd_Argc() != 2) if (Cmd_Argc() != 2) {
{
Com_Printf("unctrlbind <key> : remove commands from a key\n"); Com_Printf("unctrlbind <key> : remove commands from a key\n");
return; return;
} }
b = Key_StringToKeynum(Cmd_Argv(1)); b = Key_StringToKeynum(Cmd_Argv(1));
if (b==-1) if (b == -1) {
{
Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1)); Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return; return;
} }
@ -757,11 +756,12 @@ void Key_Unbindall_f (void)
{ {
int i; int i;
for (i=0 ; i < MAX_KEYS; i++) for (i = 0; i < MAX_KEYS; i++) {
if (keys[i].binding) if (keys[i].binding) {
Key_SetBinding(i, ""); Key_SetBinding(i, "");
} }
}
}
/* /*
=================== ===================
@ -775,35 +775,33 @@ void Key_Bind_f (void)
c = Cmd_Argc(); c = Cmd_Argc();
if (c < 2) if (c < 2) {
{
Com_Printf("bind <key> [command] : attach a command to a key\n"); Com_Printf("bind <key> [command] : attach a command to a key\n");
return; return;
} }
b = Key_StringToKeynum(Cmd_Argv(1)); b = Key_StringToKeynum(Cmd_Argv(1));
if (b==-1) if (b == -1) {
{
Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1)); Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return; return;
} }
if (c == 2) if (c == 2) {
{ if (keys[b].binding) {
if (keys[b].binding)
Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), keys[b].binding); Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), keys[b].binding);
else } else {
Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1)); Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1));
}
return; return;
} }
// copy the rest of the command line // copy the rest of the command line
cmd[0] = 0; // start out with a null string cmd[0] = 0; // start out with a null string
for (i=2 ; i< c ; i++) for (i = 2; i < c; i++) {
{
strcat(cmd, Cmd_Argv(i)); strcat(cmd, Cmd_Argv(i));
if (i != (c-1)) if (i != (c - 1)) {
strcat(cmd, " "); strcat(cmd, " ");
} }
}
Key_SetBinding(b, cmd); Key_SetBinding(b, cmd);
} }
@ -820,35 +818,33 @@ void Key_AltBind_f (void)
c = Cmd_Argc(); c = Cmd_Argc();
if (c < 2) if (c < 2) {
{
Com_Printf("altbind <key> [command] : attach a command to a key\n"); Com_Printf("altbind <key> [command] : attach a command to a key\n");
return; return;
} }
b = Key_StringToKeynum(Cmd_Argv(1)); b = Key_StringToKeynum(Cmd_Argv(1));
if (b==-1) if (b == -1) {
{
Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1)); Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return; return;
} }
if (c == 2) if (c == 2) {
{ if (altkeys[b].binding) {
if (altkeys[b].binding)
Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), altkeys[b].binding); Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), altkeys[b].binding);
else } else {
Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1)); Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1));
}
return; return;
} }
// copy the rest of the command line // copy the rest of the command line
cmd[0] = 0; // start out with a null string cmd[0] = 0; // start out with a null string
for (i=2 ; i< c ; i++) for (i = 2; i < c; i++) {
{
strcat(cmd, Cmd_Argv(i)); strcat(cmd, Cmd_Argv(i));
if (i != (c-1)) if (i != (c - 1)) {
strcat(cmd, " "); strcat(cmd, " ");
} }
}
Key_SetAltBinding(b, cmd); Key_SetAltBinding(b, cmd);
} }
@ -865,35 +861,33 @@ void Key_CtrlBind_f (void)
c = Cmd_Argc(); c = Cmd_Argc();
if (c < 2) if (c < 2) {
{
Com_Printf("ctrlbind <key> [command] : attach a command to a key\n"); Com_Printf("ctrlbind <key> [command] : attach a command to a key\n");
return; return;
} }
b = Key_StringToKeynum(Cmd_Argv(1)); b = Key_StringToKeynum(Cmd_Argv(1));
if (b==-1) if (b == -1) {
{
Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1)); Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
return; return;
} }
if (c == 2) if (c == 2) {
{ if (ctrlkeys[b].binding) {
if (ctrlkeys[b].binding)
Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), ctrlkeys[b].binding); Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), ctrlkeys[b].binding);
else } else {
Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1)); Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1));
}
return; return;
} }
// copy the rest of the command line // copy the rest of the command line
cmd[0] = 0; // start out with a null string cmd[0] = 0; // start out with a null string
for (i=2 ; i< c ; i++) for (i = 2; i < c; i++) {
{
strcat(cmd, Cmd_Argv(i)); strcat(cmd, Cmd_Argv(i));
if (i != (c-1)) if (i != (c - 1)) {
strcat(cmd, " "); strcat(cmd, " ");
} }
}
Key_SetCtrlBinding(b, cmd); Key_SetCtrlBinding(b, cmd);
} }
@ -905,7 +899,8 @@ Key_WriteBindings
Writes lines containing "bind key value" Writes lines containing "bind key value"
============ ============
*/ */
void Key_WriteBindings( fileHandle_t f ) { void Key_WriteBindings(fileHandle_t f)
{
int i; int i;
FS_Printf(f, "unbindall\n"); FS_Printf(f, "unbindall\n");
@ -913,12 +908,9 @@ void Key_WriteBindings( fileHandle_t f ) {
for (i = 0; i < MAX_KEYS; i++) { for (i = 0; i < MAX_KEYS; i++) {
if (keys[i].binding && keys[i].binding[0]) { if (keys[i].binding && keys[i].binding[0]) {
FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString(i), keys[i].binding); FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString(i), keys[i].binding);
}
} }
} }
}
/* /*
============ ============
@ -926,7 +918,8 @@ Key_Bindlist_f
============ ============
*/ */
void Key_Bindlist_f( void ) { void Key_Bindlist_f(void)
{
int i; int i;
for (i = 0; i < MAX_KEYS; i++) { for (i = 0; i < MAX_KEYS; i++) {
@ -942,7 +935,8 @@ Key_AltBindlist_f
============ ============
*/ */
void Key_AltBindlist_f( void ) { void Key_AltBindlist_f(void)
{
int i; int i;
for (i = 0; i < MAX_KEYS; i++) { for (i = 0; i < MAX_KEYS; i++) {
@ -958,7 +952,8 @@ Key_CtrlBindlist_f
============ ============
*/ */
void Key_CtrlBindlist_f( void ) { void Key_CtrlBindlist_f(void)
{
int i; int i;
for (i = 0; i < MAX_KEYS; i++) { for (i = 0; i < MAX_KEYS; i++) {
@ -973,19 +968,22 @@ void Key_CtrlBindlist_f( void ) {
Key_KeynameCompletion Key_KeynameCompletion
============ ============
*/ */
void Key_KeynameCompletion( void(*callback)(const char *s) ) { void Key_KeynameCompletion(void (*callback)(const char *s))
{
int i; int i;
for( i = 0; keynames[ i ].name != NULL; i++ ) for (i = 0; keynames[i].name != NULL; i++) {
callback(keynames[i].name); callback(keynames[i].name);
} }
}
/* /*
=================== ===================
CL_InitKeyCommands CL_InitKeyCommands
=================== ===================
*/ */
void CL_InitKeyCommands( void ) { void CL_InitKeyCommands(void)
{
// register our functions // register our functions
Cmd_AddCommand("bind", Key_Bind_f); Cmd_AddCommand("bind", Key_Bind_f);
Cmd_AddCommand("unbind", Key_Unbind_f); Cmd_AddCommand("unbind", Key_Unbind_f);
@ -1006,7 +1004,8 @@ void CL_InitKeyCommands( void ) {
CL_AddKeyUpCommands CL_AddKeyUpCommands
=================== ===================
*/ */
void CL_AddKeyUpCommands( int key, char *kb, unsigned time) { void CL_AddKeyUpCommands(int key, char *kb, unsigned time)
{
int i; int i;
char button[1024], *buttonPtr; char button[1024], *buttonPtr;
char cmd[1024]; char cmd[1024];
@ -1054,7 +1053,8 @@ CL_KeyEvent
Called by the system for both key up and key down events Called by the system for both key up and key down events
=================== ===================
*/ */
void CL_KeyEvent (int key, qboolean down, unsigned time) { void CL_KeyEvent(int key, qboolean down, unsigned time)
{
char *kb; char *kb;
char cmd[1024]; char cmd[1024];
@ -1082,30 +1082,26 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
ctrl_down = down; ctrl_down = down;
} }
if (down && !CL_FinishedIntro()) if (down && !CL_FinishedIntro()) {
{
UI_StartStageKeyEvent(); UI_StartStageKeyEvent();
return; return;
} }
if( clc.state > CA_DISCONNECTED && cge && !Key_GetCatcher() && cge->CG_CheckCaptureKey( key, down, time ) && key != K_ESCAPE ) if (clc.state > CA_DISCONNECTED && cge && !Key_GetCatcher() && cge->CG_CheckCaptureKey(key, down, time)
{ && key != K_ESCAPE) {
if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE)) if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE)) {
return; return;
} }
}
if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE)) if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE)) {
{
if (!down) { if (!down) {
return; return;
} }
if( Cvar_VariableIntegerValue( "ui_console" ) ) if (Cvar_VariableIntegerValue("ui_console")) {
{
UI_ToggleConsole(); UI_ToggleConsole();
} } else if (clc.state == CA_ACTIVE) {
else if( clc.state == CA_ACTIVE )
{
if (cg_gametype->integer) { if (cg_gametype->integer) {
UI_ToggleDMConsole(300); UI_ToggleDMConsole(300);
} }
@ -1113,8 +1109,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
return; return;
} }
if( down ) if (down) {
{
if (alt_down && key != K_ALT && key != K_INS) { if (alt_down && key != K_ALT && key != K_INS) {
altkeys[key].down = down; altkeys[key].down = down;
} }
@ -1127,25 +1122,17 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
ctrlkeys[key].down = down; ctrlkeys[key].down = down;
} }
if (key == K_ENTER) if (key == K_ENTER) {
{ if (down) {
if (down) if (keys[K_ALT].down) {
{
if (keys[K_ALT].down)
{
Key_ClearStates(); Key_ClearStates();
Cvar_SetValue( "r_fullscreen", Cvar_SetValue("r_fullscreen", !Cvar_VariableIntegerValue("r_fullscreen"));
!Cvar_VariableIntegerValue( "r_fullscreen" ) );
return; return;
} }
} }
} }
if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 || key == K_MOUSE4 || key == K_MOUSE5) {
if( key == K_MOUSE1 || key == K_MOUSE2
|| key == K_MOUSE3 || key == K_MOUSE4
|| key == K_MOUSE5 )
{
if (down) { if (down) {
cl.mouseButtons |= (1 << (key + (256 - K_MOUSE1))); cl.mouseButtons |= (1 << (key + (256 - K_MOUSE1)));
} else { } else {
@ -1153,11 +1140,10 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
} }
} }
if (!in_guimouse || key <= K_MWHEELUP || key > K_JOY1) if (!in_guimouse || key <= K_MWHEELUP || key > K_JOY1) {
{
// keys can still be used for bound actions // keys can still be used for bound actions
if (down && (key <= K_BACKSPACE || key == K_MOUSE4) && if (down && (key <= K_BACKSPACE || key == K_MOUSE4) && (clc.demoplaying || clc.state == CA_CINEMATIC)
( clc.demoplaying || clc.state == CA_CINEMATIC ) && Key_GetCatcher() == 0 ) { && Key_GetCatcher() == 0) {
Cvar_Set("nextdemo", ""); Cvar_Set("nextdemo", "");
key = K_ESCAPE; key = K_ESCAPE;
} }
@ -1168,8 +1154,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
qboolean wasup = UI_MenuUp(); qboolean wasup = UI_MenuUp();
UI_DeactiveFloatingWindows(); UI_DeactiveFloatingWindows();
if( clc.state == CA_CINEMATIC ) if (clc.state == CA_CINEMATIC) {
{
SCR_StopCinematic(); SCR_StopCinematic();
return; return;
} }
@ -1210,8 +1195,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
} }
if (!kb) { if (!kb) {
if (key >= 200) { if (key >= 200) {
Com_Printf( "%s is unbound, use controls menu to set.\n" Com_Printf("%s is unbound, use controls menu to set.\n", Key_KeynumToString(key));
, Key_KeynumToString( key ) );
} }
} else if (kb[0] == '+') { } else if (kb[0] == '+') {
int i; int i;
@ -1225,8 +1209,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
// sources can be discriminated and subframe corrected // sources can be discriminated and subframe corrected
Com_sprintf(cmd, sizeof(cmd), "%s %i %i\n", button, key, time); Com_sprintf(cmd, sizeof(cmd), "%s %i %i\n", button, key, time);
Cbuf_AddText(cmd); Cbuf_AddText(cmd);
} } else {
else {
// down-only command // down-only command
Cbuf_AddText(button); Cbuf_AddText(button);
Cbuf_AddText("\n"); Cbuf_AddText("\n");
@ -1265,7 +1248,6 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
} }
} }
/* /*
=================== ===================
CL_CharEvent CL_CharEvent
@ -1273,7 +1255,8 @@ CL_CharEvent
Normal keyboard characters, already shifted / capslocked / etc Normal keyboard characters, already shifted / capslocked / etc
=================== ===================
*/ */
void CL_CharEvent( int key ) { void CL_CharEvent(int key)
{
// the console key should never be used as a char // the console key should never be used as a char
if (key == '`' || key == '~') { if (key == '`' || key == '~') {
return; return;
@ -1295,7 +1278,6 @@ void CL_CharEvent( int key ) {
} }
} }
/* /*
=================== ===================
Key_ClearStates Key_ClearStates
@ -1310,7 +1292,6 @@ void Key_ClearStates (void)
for (i = 0; i < MAX_KEYS; i++) { for (i = 0; i < MAX_KEYS; i++) {
if (keys[i].down) { if (keys[i].down) {
CL_KeyEvent(i, qfalse, 0); CL_KeyEvent(i, qfalse, 0);
} }
keys[i].down = 0; keys[i].down = 0;
keys[i].repeats = 0; keys[i].repeats = 0;
@ -1324,7 +1305,8 @@ static int keyCatchers = 0;
Key_GetCatcher Key_GetCatcher
==================== ====================
*/ */
int Key_GetCatcher( void ) { int Key_GetCatcher(void)
{
return cls.keyCatchers; return cls.keyCatchers;
} }
@ -1333,6 +1315,7 @@ int Key_GetCatcher( void ) {
Key_SetCatcher Key_SetCatcher
==================== ====================
*/ */
void Key_SetCatcher( int catcher ) { void Key_SetCatcher(int catcher)
{
keyCatchers = catcher; keyCatchers = catcher;
} }