cleaned up entity culling in server code, implemented new option - sv_cullentities_tr...

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index a43a9d9a3d4d0f15f0cba835617aea6d62af1c6c..481f843d88bac3f452174e69f33be4927cafd70f 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -70,7 +70,7 @@ void KeyDown (kbutton_t *b)
 
        if (k == b->down[0] || k == b->down[1])
                return;         // repeating key
-       
+
        if (!b->down[0])
                b->down[0] = k;
        else if (!b->down[1])
@@ -189,25 +189,33 @@ float CL_KeyState (kbutton_t *key)
        val = 0;
        
        if (impulsedown && !impulseup)
+       {
                if (down)
                        val = 0.5;      // pressed and held this frame
                else
                        val = 0;        //      I_Error ();
+       }
        if (impulseup && !impulsedown)
+       {
                if (down)
                        val = 0;        //      I_Error ();
                else
                        val = 0;        // released this frame
+       }
        if (!impulsedown && !impulseup)
+       {
                if (down)
                        val = 1.0;      // held the entire frame
                else
                        val = 0;        // up the entire frame
+       }
        if (impulsedown && impulseup)
+       {
                if (down)
                        val = 0.75;     // released and re-pressed this frame
                else
                        val = 0.25;     // pressed and released this frame
+       }
 
        key->state &= 1;                // clear impulses
        
@@ -219,17 +227,17 @@ float CL_KeyState (kbutton_t *key)
 
 //==========================================================================
 
-cvar_t cl_upspeed = {"cl_upspeed","200"};
-cvar_t cl_forwardspeed = {"cl_forwardspeed","200", true};
-cvar_t cl_backspeed = {"cl_backspeed","200", true};
-cvar_t cl_sidespeed = {"cl_sidespeed","350"};
+cvar_t cl_upspeed = {CVAR_SAVE, "cl_upspeed","400"};
+cvar_t cl_forwardspeed = {CVAR_SAVE, "cl_forwardspeed","400"};
+cvar_t cl_backspeed = {CVAR_SAVE, "cl_backspeed","400"};
+cvar_t cl_sidespeed = {CVAR_SAVE, "cl_sidespeed","350"};
 
-cvar_t cl_movespeedkey = {"cl_movespeedkey","2.0"};
+cvar_t cl_movespeedkey = {CVAR_SAVE, "cl_movespeedkey","2.0"};
 
-cvar_t cl_yawspeed = {"cl_yawspeed","140"};
-cvar_t cl_pitchspeed = {"cl_pitchspeed","150"};
+cvar_t cl_yawspeed = {CVAR_SAVE, "cl_yawspeed","140"};
+cvar_t cl_pitchspeed = {CVAR_SAVE, "cl_pitchspeed","150"};
 
-cvar_t cl_anglespeedkey = {"cl_anglespeedkey","1.5"};
+cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5"};
 
 
 /*
@@ -243,17 +251,17 @@ void CL_AdjustAngles (void)
 {
        float   speed;
        float   up, down;
-       
+
        if (in_speed.state & 1)
-               speed = host_frametime * cl_anglespeedkey.value;
+               speed = cl.frametime * cl_anglespeedkey.value;
        else
-               speed = host_frametime;
+               speed = cl.frametime;
 
        if (!(in_strafe.state & 1))
        {
                cl.viewangles[YAW] -= speed*cl_yawspeed.value*CL_KeyState (&in_right);
                cl.viewangles[YAW] += speed*cl_yawspeed.value*CL_KeyState (&in_left);
-               cl.viewangles[YAW] = anglemod(cl.viewangles[YAW]);
+               cl.viewangles[YAW] = ANGLEMOD(cl.viewangles[YAW]);
        }
        if (in_klook.state & 1)
        {
@@ -261,10 +269,10 @@ void CL_AdjustAngles (void)
                cl.viewangles[PITCH] -= speed*cl_pitchspeed.value * CL_KeyState (&in_forward);
                cl.viewangles[PITCH] += speed*cl_pitchspeed.value * CL_KeyState (&in_back);
        }
-       
+
        up = CL_KeyState (&in_lookup);
        down = CL_KeyState(&in_lookdown);
-       
+
        cl.viewangles[PITCH] -= speed*cl_pitchspeed.value * up;
        cl.viewangles[PITCH] += speed*cl_pitchspeed.value * down;
 
@@ -374,8 +382,16 @@ void CL_SendMove (usercmd_t *cmd)
 
        MSG_WriteFloat (&buf, cl.mtime[0]);     // so server can get ping times
 
-       for (i=0 ; i<3 ; i++)
-               MSG_WriteAngle (&buf, cl.viewangles[i]);
+       if (dpprotocol)
+       {
+               for (i=0 ; i<3 ; i++)
+                       MSG_WritePreciseAngle (&buf, cl.viewangles[i]);
+       }
+       else
+       {
+               for (i=0 ; i<3 ; i++)
+                       MSG_WriteAngle (&buf, cl.viewangles[i]);
+       }
        
     MSG_WriteShort (&buf, forwardmove);
     MSG_WriteShort (&buf, sidemove);
@@ -414,8 +430,7 @@ void CL_SendMove (usercmd_t *cmd)
                return;
 
 //
-// allways dump the first two message, because it may contain leftover inputs
-// from the last level
+// always dump the first two messages, because they may contain leftover inputs from the last level
 //
        if (++cl.movemessages <= 2)
                return;