X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=018eb2c162c32b2f90feee6c1e7c79ffed474d01;hb=66ae08799675241ffa3cc3bcaa211fddcd63387c;hp=e5f6e2e50fd1922bd96fdca01b8b1e51fba184dd;hpb=142ec9e43c5bd046ce3a33e822167373bf244d21;p=xonotic%2Fdarkplaces.git diff --git a/cl_input.c b/cl_input.c index e5f6e2e5..018eb2c1 100644 --- a/cl_input.c +++ b/cl_input.c @@ -59,8 +59,8 @@ int in_impulse; void KeyDown (kbutton_t *b) { - int k; - char *c; + int k; + const char *c; c = Cmd_Argv(1); if (c[0]) @@ -80,7 +80,7 @@ void KeyDown (kbutton_t *b) Con_Printf ("Three keys down for a button!\n"); return; } - + if (b->state & 1) return; // still down b->state |= 1 + 2; // down + impulse down @@ -88,9 +88,9 @@ void KeyDown (kbutton_t *b) void KeyUp (kbutton_t *b) { - int k; - char *c; - + int k; + const char *c; + c = Cmd_Argv(1); if (c[0]) k = atoi(c); @@ -119,10 +119,11 @@ void KeyUp (kbutton_t *b) void IN_KLookDown (void) {KeyDown(&in_klook);} void IN_KLookUp (void) {KeyUp(&in_klook);} void IN_MLookDown (void) {KeyDown(&in_mlook);} -void IN_MLookUp (void) { -KeyUp(&in_mlook); -if ( !(in_mlook.state&1) && lookspring.value) - V_StartPitchDrift(); +void IN_MLookUp (void) +{ + KeyUp(&in_mlook); + if ( !(in_mlook.state&1) && lookspring.value) + V_StartPitchDrift(); } void IN_UpDown(void) {KeyDown(&in_up);} void IN_UpUp(void) {KeyUp(&in_up);} @@ -154,12 +155,18 @@ void IN_AttackDown(void) {KeyDown(&in_attack);} void IN_AttackUp(void) {KeyUp(&in_attack);} // LordHavoc: added 6 new buttons -void IN_Button3Down(void) {KeyDown(&in_button3);} void IN_Button3Up(void) {KeyUp(&in_button3);} -void IN_Button4Down(void) {KeyDown(&in_button4);} void IN_Button4Up(void) {KeyUp(&in_button4);} -void IN_Button5Down(void) {KeyDown(&in_button5);} void IN_Button5Up(void) {KeyUp(&in_button5);} -void IN_Button6Down(void) {KeyDown(&in_button6);} void IN_Button6Up(void) {KeyUp(&in_button6);} -void IN_Button7Down(void) {KeyDown(&in_button7);} void IN_Button7Up(void) {KeyUp(&in_button7);} -void IN_Button8Down(void) {KeyDown(&in_button8);} void IN_Button8Up(void) {KeyUp(&in_button8);} +void IN_Button3Down(void) {KeyDown(&in_button3);} +void IN_Button3Up(void) {KeyUp(&in_button3);} +void IN_Button4Down(void) {KeyDown(&in_button4);} +void IN_Button4Up(void) {KeyUp(&in_button4);} +void IN_Button5Down(void) {KeyDown(&in_button5);} +void IN_Button5Up(void) {KeyUp(&in_button5);} +void IN_Button6Down(void) {KeyDown(&in_button6);} +void IN_Button6Up(void) {KeyUp(&in_button6);} +void IN_Button7Down(void) {KeyDown(&in_button7);} +void IN_Button7Up(void) {KeyUp(&in_button7);} +void IN_Button8Down(void) {KeyDown(&in_button8);} +void IN_Button8Up(void) {KeyUp(&in_button8);} void IN_UseDown (void) {KeyDown(&in_use);} void IN_UseUp (void) {KeyUp(&in_use);} @@ -511,3 +518,4 @@ void CL_InitInput (void) Cmd_AddCommand ("+button8", IN_Button8Down); Cmd_AddCommand ("-button8", IN_Button8Up); } +