Give CSQC entity scopes names.

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index 2dd21acd06d6a296af379bc67e10cfd42781b988..ecebd716a31f357e415bf39f2c07b0140f137528 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -443,8 +443,8 @@ cvar_t cl_movement_jumpvelocity = {0, "cl_movement_jumpvelocity", "270", "how fa
 cvar_t cl_movement_airaccel_qw = {0, "cl_movement_airaccel_qw", "1", "ratio of QW-style air control as opposed to simple acceleration (reduces speed gain when zigzagging) (should match sv_airaccel_qw); when < 0, the speed is clamped against the maximum allowed forward speed after the move"};
 cvar_t cl_movement_airaccel_sideways_friction = {0, "cl_movement_airaccel_sideways_friction", "0", "anti-sideways movement stabilization (should match sv_airaccel_sideways_friction); when < 0, only so much friction is applied that braking (by accelerating backwards) cannot be stronger"};
 
-cvar_t in_pitch_min = {0, "in_pitch_min", "-90", "how far downward you can aim (quake used -70"};
-cvar_t in_pitch_max = {0, "in_pitch_max", "90", "how far upward you can aim (quake used 80"};
+cvar_t in_pitch_min = {0, "in_pitch_min", "-90", "how far you can aim upward (quake used -70)"};
+cvar_t in_pitch_max = {0, "in_pitch_max", "90", "how far you can aim downward (quake used 80)"};
 
 cvar_t m_filter = {CVAR_SAVE, "m_filter","0", "smoothes mouse movement, less responsive but smoother aiming"};
 cvar_t m_accelerate = {CVAR_SAVE, "m_accelerate","1", "mouse acceleration factor (try 2)"};
@@ -574,7 +574,7 @@ void CL_Input (void)
                        static int oldwindowmouse[2];
                        if (oldwindowmouse[0] != in_windowmouse_x || oldwindowmouse[1] != in_windowmouse_y)
                        {
-                               CL_VM_InputEvent(3, in_windowmouse_x * vid_conwidth.integer / vid.width, in_windowmouse_y * vid_conheight.integer / vid.height);
+                               CL_VM_InputEvent(3, in_windowmouse_x * vid_conwidth.value / vid.width, in_windowmouse_y * vid_conheight.value / vid.height);
                                oldwindowmouse[0] = in_windowmouse_x;
                                oldwindowmouse[1] = in_windowmouse_y;
                        }
@@ -582,7 +582,7 @@ void CL_Input (void)
                else
                {
                        if (in_mouse_x || in_mouse_y)
-                               CL_VM_InputEvent(2, in_mouse_x * vid_conwidth.integer / vid.width, in_mouse_y * vid_conheight.integer / vid.height);
+                               CL_VM_InputEvent(2, in_mouse_x, in_mouse_y);
                }
        }
 
@@ -697,7 +697,6 @@ void CL_Input (void)
                {
                        // digital direction, analog amount
                        vec_t wishvel_x, wishvel_y;
-                       f *= max(cl_sidespeed.value, max(cl_forwardspeed.value, cl_backspeed.value));
                        wishvel_x = fabs(cl.cmd.forwardmove);
                        wishvel_y = fabs(cl.cmd.sidemove);
                        if(wishvel_x != 0 && wishvel_y != 0 && wishvel_x != wishvel_y)
@@ -1073,7 +1072,7 @@ static void CL_ClientMovement_Physics_Swim(cl_clientmovement_state_t *s)
                                s->velocity[2] =  80;
                        else
                        {
-                               if (gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+                               if (IS_NEXUIZ_DERIVED(gamemode))
                                        s->velocity[2] = 200;
                                else
                                        s->velocity[2] = 100;
@@ -1510,8 +1509,8 @@ void CL_UpdateMoveVars(void)
        else
        {
                cl.moveflags = 0;
-               cl.movevars_ticrate = slowmo.value / bound(1.0f, cl_netfps.value, 1000.0f);
-               cl.movevars_timescale = slowmo.value;
+               cl.movevars_ticrate = (cls.demoplayback ? 1.0f : slowmo.value) / bound(1.0f, cl_netfps.value, 1000.0f);
+               cl.movevars_timescale = (cls.demoplayback ? 1.0f : slowmo.value);
                cl.movevars_gravity = sv_gravity.value;
                cl.movevars_stopspeed = cl_movement_stopspeed.value;
                cl.movevars_maxspeed = cl_movement_maxspeed.value;
@@ -1547,7 +1546,7 @@ void CL_UpdateMoveVars(void)
 
        if(!(cl.moveflags & MOVEFLAG_VALID))
        {
-               if(gamemode == GAME_NEXUIZ)
+               if(gamemode == GAME_NEXUIZ)  // Legacy hack to work with old servers of Nexuiz.
                        cl.moveflags = MOVEFLAG_Q2AIRACCELERATE;
        }
 
@@ -2092,7 +2091,7 @@ void CL_SendMove(void)
 
        // send the reliable message (forwarded commands) if there is one
        if (buf.cursize || cls.netcon->message.cursize)
-               NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, max(20*(buf.cursize+40), cl_rate.integer), false);
+               NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, max(20*(buf.cursize+40), cl_rate.integer), cl_rate_burstsize.integer, false);
 
        if (quemove)
        {