cl_input: Implement CheckJump function. Rename ambiguous variable

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@13070 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_input.c b/cl_input.c
index a1e8cb85b6fa3912a51c9f24888340a461281951..a75495cf46ab6f2f2d95cd586139b84b28ce89f4 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -1294,13 +1294,30 @@ static void CL_ClientMovement_Physics_PM_AirAccelerate(cl_clientmovement_state_t
     VectorMA( s->velocity, accelspeed, acceldir, s->velocity );
 }
 
+static void CL_ClientMovement_Physics_CheckJump(cl_clientmovement_state_t *s)
+{
+       // jump if on ground with jump button pressed but only if it has been
+       // released at least once since the last jump
+       if (s->cmd.jump)
+       {
+               if (s->onground && (s->cmd.canjump || !cl_movement_track_canjump.integer))
+               {
+                       s->velocity[2] += cl.movevars_jumpvelocity;
+                       s->onground = false;
+                       s->cmd.canjump = false;
+               }
+       }
+       else
+               s->cmd.canjump = true;
+}
+
 static void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 {
        vec_t friction;
        vec_t wishspeed;
        vec_t addspeed;
        vec_t accelspeed;
-       vec_t f;
+       vec_t speed;
        vec_t gravity;
        vec3_t forward;
        vec3_t right;
@@ -1310,19 +1327,7 @@ static void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
        vec3_t yawangles;
        trace_t trace;
 
-       // jump if on ground with jump button pressed but only if it has been
-       // released at least once since the last jump
-       if (s->cmd.jump)
-       {
-               if (s->onground && (s->cmd.canjump || !cl_movement_track_canjump.integer))
-               {
-                       s->velocity[2] += cl.movevars_jumpvelocity;
-                       s->onground = false;
-                       s->cmd.canjump = false;
-               }
-       }
-       else
-               s->cmd.canjump = true;
+       CL_ClientMovement_Physics_CheckJump(s);
 
        // calculate movement vector
        VectorSet(yawangles, 0, s->cmd.viewangles[1], 0);
@@ -1341,8 +1346,8 @@ static void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
                        wishspeed *= 0.5;
 
                // apply edge friction
-               f = sqrt(s->velocity[0] * s->velocity[0] + s->velocity[1] * s->velocity[1]);
-               if (f > 0)
+               speed = VectorLength2(s->velocity);
+               if (speed > 0)
                {
                        friction = cl.movevars_friction;
                        if (cl.movevars_edgefriction != 1)
@@ -1352,7 +1357,7 @@ static void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
                                // note: QW uses the full player box for the trace, and yet still
                                // uses s->origin[2] + s->mins[2], which is clearly an bug, but
                                // this mimics it for compatibility
-                               VectorSet(neworigin2, s->origin[0] + s->velocity[0]*(16/f), s->origin[1] + s->velocity[1]*(16/f), s->origin[2] + s->mins[2]);
+                               VectorSet(neworigin2, s->origin[0] + s->velocity[0]*(16/speed), s->origin[1] + s->velocity[1]*(16/speed), s->origin[2] + s->mins[2]);
                                VectorSet(neworigin3, neworigin2[0], neworigin2[1], neworigin2[2] - 34);
                                if (cls.protocol == PROTOCOL_QUAKEWORLD)
                                        trace = CL_TraceBox(neworigin2, s->mins, s->maxs, neworigin3, MOVE_NORMAL, s->self, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP, 0, 0, collision_extendmovelength.value, true, true, NULL, true);
@@ -1362,9 +1367,9 @@ static void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
                                        friction *= cl.movevars_edgefriction;
                        }
                        // apply ground friction
-                       f = 1 - s->cmd.frametime * friction * ((f < cl.movevars_stopspeed) ? (cl.movevars_stopspeed / f) : 1);
-                       f = max(f, 0);
-                       VectorScale(s->velocity, f, s->velocity);
+                       speed = 1 - s->cmd.frametime * friction * ((speed < cl.movevars_stopspeed) ? (cl.movevars_stopspeed / speed) : 1);
+                       speed = max(speed, 0);
+                       VectorScale(s->velocity, speed, s->velocity);
                }
                addspeed = wishspeed - DotProduct(s->velocity, wishdir);
                if (addspeed > 0)