Fixed AK version of the FS code, it should now behave as expected, without much dupli...

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index 196301094c958ff18ce06ac9d07cf2a2e4d2c534..2948b61af2c918612e0ec54f4bb7b29a05267223 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -49,7 +49,7 @@ state bit 2 is edge triggered on the down to up transition
 kbutton_t      in_mlook, in_klook;
 kbutton_t      in_left, in_right, in_forward, in_back;
 kbutton_t      in_lookup, in_lookdown, in_moveleft, in_moveright;
-kbutton_t      in_strafe, in_speed, in_use, in_jump, in_attack;
+kbutton_t      in_strafe, in_speed, in_jump, in_attack;
 kbutton_t      in_up, in_down;
 // LordHavoc: added 6 new buttons
 kbutton_t      in_button3, in_button4, in_button5, in_button6, in_button7, in_button8;
@@ -168,8 +168,6 @@ 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);}
 void IN_JumpDown (void) {KeyDown(&in_jump);}
 void IN_JumpUp (void) {KeyUp(&in_jump);}
 
@@ -261,9 +259,9 @@ void CL_AdjustAngles (void)
        float   up, down;
 
        if (in_speed.state & 1)
-               speed = cl.frametime * cl_anglespeedkey.value;
+               speed = host_realframetime * cl_anglespeedkey.value;
        else
-               speed = cl.frametime;
+               speed = host_realframetime;
 
        if (!(in_strafe.state & 1))
        {
@@ -448,7 +446,7 @@ void CL_SendMove(usercmd_t *cmd)
                        i = cl.entitydatabase4->ackframenum;
                        if (cl_nodelta.integer)
                                i = -1;
-                       if (developer_networkentities.integer)
+                       if (developer_networkentities.integer >= 1)
                                Con_Printf("send clc_ackentities %i\n", i);
                        MSG_WriteByte(&buf, clc_ackentities);
                        MSG_WriteLong(&buf, i);
@@ -503,8 +501,6 @@ void CL_InitInput (void)
        Cmd_AddCommand ("-speed", IN_SpeedUp);
        Cmd_AddCommand ("+attack", IN_AttackDown);
        Cmd_AddCommand ("-attack", IN_AttackUp);
-       Cmd_AddCommand ("+use", IN_UseDown);
-       Cmd_AddCommand ("-use", IN_UseUp);
        Cmd_AddCommand ("+jump", IN_JumpDown);
        Cmd_AddCommand ("-jump", IN_JumpUp);
        Cmd_AddCommand ("impulse", IN_Impulse);