fix more warnings

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index e0b7e2619a9569aa072d00f88968d194a4a131ba..6ca50da589fd0c85efbe49abfde0697c3039fad5 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -1078,19 +1078,41 @@ void CL_ClientMovement_Physics_Swim(cl_clientmovement_state_t *s)
        CL_ClientMovement_Move(s);
 }
 
+static vec_t CL_IsMoveInDirection(vec_t forward, vec_t side, vec_t angle)
+{
+       if(forward == 0 && side == 0)
+               return 0; // avoid division by zero
+       angle -= RAD2DEG(atan2(side, forward));
+       angle = (ANGLEMOD(angle + 180) - 180) / 45;
+       if(angle >  1)
+               return 0;
+       if(angle < -1)
+               return 0;
+       return 1 - fabs(angle);
+}
+
 void CL_ClientMovement_Physics_CPM_PM_Aircontrol(cl_clientmovement_state_t *s, vec3_t wishdir, vec_t wishspeed)
 {
        vec_t zspeed, speed, dot, k;
 
+#if 0
+       // this doesn't play well with analog input
        if(s->cmd.forwardmove == 0 || s->cmd.sidemove != 0)
                return;
-       
+       k = 32;
+#else
+       k = 32 * (2 * CL_IsMoveInDirection(s->cmd.forwardmove, s->cmd.sidemove, 0) - 1);
+       if(k <= 0)
+               return;
+#endif
+
+       k *= bound(0, wishspeed / cl.movevars_maxairspeed, 1);
+
        zspeed = s->velocity[2];
        s->velocity[2] = 0;
        speed = VectorNormalizeLength(s->velocity);
 
        dot = DotProduct(s->velocity, wishdir);
-       k = 32;
        k *= cl.movevars_aircontrol*dot*dot*s->cmd.frametime;
 
        if(dot > 0) { // we can't change direction while slowing down
@@ -1144,7 +1166,10 @@ void CL_ClientMovement_Physics_PM_Accelerate(cl_clientmovement_state_t *s, vec3_
                if(fmin <= 0)
                        VectorScale(vel_perpend, f, vel_perpend);
                else
-                       VectorScale(vel_perpend, min(1.0f, max(fmin, f)), vel_perpend);
+               {
+                       fmin = sqrt(fmin);
+                       VectorScale(vel_perpend, bound(fmin, f, 1.0f), vel_perpend);
+               }
        }
        else
                VectorScale(vel_perpend, 1 - s->cmd.frametime * wishspeed * sidefric, vel_perpend);
@@ -1322,6 +1347,9 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
                        if(cl.movevars_airstopaccelerate != 0)
                                if(DotProduct(s->velocity, wishdir) < 0)
                                        accel = cl.movevars_airstopaccelerate;
+                       // this doesn't play well with analog input, but can't really be
+                       // fixed like the AirControl can. So, don't set the maxairstrafe*
+                       // cvars when you want to support analog input.
                        if(s->cmd.forwardmove == 0 && s->cmd.sidemove != 0)
                        {
                                if(cl.movevars_maxairstrafespeed)