small strafe efficiency code readability enhancement

diff --git a/qcsrc/server/strafe.qc b/qcsrc/server/strafe.qc
index c7ccff4fb527437d57963ba23a334e0ae7c51143..c25b1ef4e5494ff0becf43fbf8a53dd3f05ca757 100644 (file)
--- a/qcsrc/server/strafe.qc
+++ b/qcsrc/server/strafe.qc
@@ -13,178 +13,176 @@ float calculate_strafe_efficiency(entity strafeplayer, vector movement, float dt
     bool swimming = strafeplayer.waterlevel >= WATERLEVEL_SWIMMING;
     float speed = vlen(vec2(strafeplayer.velocity));
 
-    if(speed > 0 && !swimming && strafeplayer.race_started) // only calculate the efficiency if all conditions are met
+    if(speed <= 0 || swimming || !strafeplayer.race_started) return 0; // only calculate the efficiency if all conditions are met
+    strafeplayer.strafe_efficiency_time += dt;
+
+    // physics
+    bool   onground                      = IS_ONGROUND(strafeplayer) && !(PHYS_INPUT_BUTTON_JUMP(strafeplayer) || PHYS_INPUT_BUTTON_JETPACK(strafeplayer));
+    bool   onslick                       = IS_ONSLICK(strafeplayer);
+    bool   strafekeys;
+    float  maxspeed_mod                  = IS_DUCKED(strafeplayer) ? .5 : 1;
+    float  maxspeed_phys                 = onground ? PHYS_MAXSPEED(strafeplayer) : PHYS_MAXAIRSPEED(strafeplayer);
+    float  maxspeed                      = maxspeed_phys * maxspeed_mod;
+    float  movespeed;
+    float  bestspeed;
+    float  maxaccel_phys                 = onground ? PHYS_ACCELERATE(strafeplayer) : PHYS_AIRACCELERATE(strafeplayer);
+    float  maxaccel                      = maxaccel_phys;
+    float  vel_angle                     = vectoangles(strafeplayer.velocity).y - (vectoangles(strafeplayer.velocity).y > 180 ? 360 : 0); // change the range from 0° - 360° to -180° - 180° to match how view_angle represents angles
+    float  view_angle                    = PHYS_INPUT_ANGLES(strafeplayer).y;
+    float  angle;
+    int    keys_fwd;
+    float  wishangle;
+    bool   fwd                           = true;
+
+    // determine whether the player is pressing forwards or backwards keys
+    if(movement.x > 0)
     {
-        // physics
-        bool   onground                      = IS_ONGROUND(strafeplayer) && !(PHYS_INPUT_BUTTON_JUMP(strafeplayer) || PHYS_INPUT_BUTTON_JETPACK(strafeplayer));
-        bool   onslick                       = IS_ONSLICK(strafeplayer);
-        bool   strafekeys;
-        float  maxspeed_mod                  = IS_DUCKED(strafeplayer) ? .5 : 1;
-        float  maxspeed_phys                 = onground ? PHYS_MAXSPEED(strafeplayer) : PHYS_MAXAIRSPEED(strafeplayer);
-        float  maxspeed                      = maxspeed_phys * maxspeed_mod;
-        float  movespeed;
-        float  bestspeed;
-        float  maxaccel_phys                 = onground ? PHYS_ACCELERATE(strafeplayer) : PHYS_AIRACCELERATE(strafeplayer);
-        float  maxaccel                      = maxaccel_phys;
-        float  vel_angle                     = vectoangles(strafeplayer.velocity).y - (vectoangles(strafeplayer.velocity).y > 180 ? 360 : 0); // change the range from 0° - 360° to -180° - 180° to match how view_angle represents angles
-        float  view_angle                    = PHYS_INPUT_ANGLES(strafeplayer).y;
-        float  angle;
-        int    keys_fwd;
-        float  wishangle;
-        bool   fwd                           = true;
-
-        // determine whether the player is pressing forwards or backwards keys
-        if(movement.x > 0)
+        keys_fwd = 1;
+    }
+    else if(movement.x < 0)
+    {
+        keys_fwd = -1;
+    }
+    else
+    {
+        keys_fwd = 0;
+    }
+
+    // determine player wishdir
+    if(movement.x == 0)
+    {
+        if(movement.y < 0)
         {
-            keys_fwd = 1;
+            wishangle = -90;
         }
-        else if(movement.x < 0)
+        else if(movement.y > 0)
         {
-            keys_fwd = -1;
+            wishangle = 90;
         }
         else
         {
-            keys_fwd = 0;
+            wishangle = 0;
         }
-
-        // determine player wishdir
-        if(movement.x == 0)
+    }
+    else
+    {
+        if(movement.y == 0)
         {
-            if(movement.y < 0)
-            {
-                wishangle = -90;
-            }
-            else if(movement.y > 0)
-            {
-                wishangle = 90;
-            }
-            else
-            {
-                wishangle = 0;
-            }
+            wishangle = 0;
         }
         else
         {
-            if(movement.y == 0)
+            wishangle = RAD2DEG * atan2(movement.y, movement.x);
+            // wrap the wish angle if it exceeds ±90°
+            if(fabs(wishangle) > 90)
             {
-                wishangle = 0;
-            }
-            else
-            {
-                wishangle = RAD2DEG * atan2(movement.y, movement.x);
-                // wrap the wish angle if it exceeds ±90°
-                if(fabs(wishangle) > 90)
-                {
-                    if(wishangle < 0) wishangle += 180;
-                    else wishangle -= 180;
-                    wishangle = -wishangle;
-                }
+                if(wishangle < 0) wishangle += 180;
+                else wishangle -= 180;
+                wishangle = -wishangle;
             }
         }
+    }
 
-        strafekeys = fabs(wishangle) == 90;
+    strafekeys = fabs(wishangle) == 90;
 
-        if(strafekeys && !onground && !swimming)
-        {
-            if(PHYS_MAXAIRSTRAFESPEED(strafeplayer) != 0)
-                maxspeed = min(PHYS_MAXAIRSTRAFESPEED(strafeplayer), PHYS_MAXAIRSPEED(strafeplayer) * maxspeed_mod);
-            if(PHYS_AIRSTRAFEACCELERATE(strafeplayer) != 0)
-                maxaccel = PHYS_AIRSTRAFEACCELERATE(strafeplayer);
-        }
+    if(strafekeys && !onground && !swimming)
+    {
+        if(PHYS_MAXAIRSTRAFESPEED(strafeplayer) != 0)
+            maxspeed = min(PHYS_MAXAIRSTRAFESPEED(strafeplayer), PHYS_MAXAIRSPEED(strafeplayer) * maxspeed_mod);
+        if(PHYS_AIRSTRAFEACCELERATE(strafeplayer) != 0)
+            maxaccel = PHYS_AIRSTRAFEACCELERATE(strafeplayer);
+    }
 
-        movespeed = min(vlen(vec2(movement)), maxspeed);
+    movespeed = min(vlen(vec2(movement)), maxspeed);
 
-        maxaccel *= dt * movespeed;
-        bestspeed = max(movespeed - maxaccel, 0);
+    maxaccel *= dt * movespeed;
+    bestspeed = max(movespeed - maxaccel, 0);
 
-        float strafespeed = speed; // speed minus friction
+    float strafespeed = speed; // speed minus friction
 
-        if((strafespeed > 0) && onground){
-            float strafefriction = onslick ? PHYS_FRICTION_SLICK(strafeplayer) : PHYS_FRICTION(strafeplayer);
-            float f = 1 - dt * strafefriction * max(PHYS_STOPSPEED(strafeplayer) / strafespeed, 1);
+    if((strafespeed > 0) && onground){
+        float strafefriction = onslick ? PHYS_FRICTION_SLICK(strafeplayer) : PHYS_FRICTION(strafeplayer);
+        float f = 1 - dt * strafefriction * max(PHYS_STOPSPEED(strafeplayer) / strafespeed, 1);
 
-            if(f <= 0)
-                strafespeed = 0;
-            else
-                strafespeed *= f;
-        }
+        if(f <= 0)
+            strafespeed = 0;
+        else
+            strafespeed *= f;
+    }
 
-        // get current strafing angle ranging from -180° to +180°
-        // calculate view angle relative to the players current velocity direction
-        angle = vel_angle - view_angle;
+    // get current strafing angle ranging from -180° to +180°
+    // calculate view angle relative to the players current velocity direction
+    angle = vel_angle - view_angle;
 
-        // if the angle goes above 180° or below -180° wrap it to the opposite side since we want the interior angle
-        if (angle > 180) angle -= 360;
-        else if(angle < -180) angle += 360;
+    // if the angle goes above 180° or below -180° wrap it to the opposite side since we want the interior angle
+    if (angle > 180) angle -= 360;
+    else if(angle < -180) angle += 360;
 
-        // determine whether the player is strafing forwards or backwards
-        // if the player isn't strafe turning use forwards/backwards keys to determine direction
-        if(!strafekeys)
+    // determine whether the player is strafing forwards or backwards
+    // if the player isn't strafe turning use forwards/backwards keys to determine direction
+    if(!strafekeys)
+    {
+        if(keys_fwd > 0)
         {
-            if(keys_fwd > 0)
-            {
-                fwd = true;
-            }
-            else if(keys_fwd < 0)
-            {
-                fwd = false;
-            }
-            else
-            {
-                fwd = fabs(angle) <= 90;
-            }
+            fwd = true;
+        }
+        else if(keys_fwd < 0)
+        {
+            fwd = false;
         }
-        // otherwise determine by examining the strafe angle
         else
         {
-            if(wishangle < 0) // detect direction since the direction is not yet set
-            {
-                fwd = angle <= -wishangle;
-            }
-            else
-            {
-                fwd = angle >= -wishangle;
-            }
+            fwd = fabs(angle) <= 90;
         }
-
-        // shift the strafe angle by 180° when strafing backwards
-        if(!fwd)
+    }
+    // otherwise determine by examining the strafe angle
+    else
+    {
+        if(wishangle < 0) // detect direction since the direction is not yet set
         {
-            if(angle < 0) angle += 180;
-            else angle -= 180;
+            fwd = angle <= -wishangle;
         }
-
-        // invert the wish angle when strafing backwards
-        if(!fwd)
+        else
         {
-            wishangle = -wishangle;
+            fwd = angle >= -wishangle;
         }
+    }
 
-        // note about accuracy: a few ticks after dying do still have race_started set to true causing minimal interference in the efficiency total
-        float efficiency = 0;
-        float moveangle = fabs(angle + wishangle);
-        float bestangle = (strafespeed > bestspeed ? acos(bestspeed / strafespeed) : 0) * RAD2DEG;
-        float prebestangle = (strafespeed > movespeed ? acos(movespeed / strafespeed) : 0) * RAD2DEG;
+    // shift the strafe angle by 180° when strafing backwards
+    if(!fwd)
+    {
+        if(angle < 0) angle += 180;
+        else angle -= 180;
+    }
 
-        strafeplayer.strafe_efficiency_time += dt;
-        if(fabs(vlen(vec2(movement))) > 0)
+    // invert the wish angle when strafing backwards
+    if(!fwd)
+    {
+        wishangle = -wishangle;
+    }
+
+    // note about accuracy: a few ticks after dying do still have race_started set to true causing minimal interference in the efficiency total
+    float efficiency = 0;
+    float moveangle = fabs(angle + wishangle);
+    float bestangle = (strafespeed > bestspeed ? acos(bestspeed / strafespeed) : 0) * RAD2DEG;
+    float prebestangle = (strafespeed > movespeed ? acos(movespeed / strafespeed) : 0) * RAD2DEG;
+
+    if(fabs(vlen(vec2(movement))) > 0)
+    {
+        if(moveangle >= 90)
         {
-            if(moveangle >= 90)
-            {
-                efficiency = (moveangle - 90) / 90;
-                if(efficiency > 1) efficiency = 2 - efficiency;
-                efficiency *= -1;
-            }
-            else if(moveangle >= bestangle)
-            {
-                efficiency = (90 - moveangle) / (90 - bestangle);
-            }
-            else if(moveangle >= prebestangle)
-            {
-                efficiency = (moveangle - prebestangle) / (bestangle - prebestangle);
-            }
+            efficiency = (moveangle - 90) / 90;
+            if(efficiency > 1) efficiency = 2 - efficiency;
+            efficiency *= -1;
+        }
+        else if(moveangle >= bestangle)
+        {
+            efficiency = (90 - moveangle) / (90 - bestangle);
+        }
+        else if(moveangle >= prebestangle)
+        {
+            efficiency = (moveangle - prebestangle) / (bestangle - prebestangle);
         }
-        return efficiency;
     }
-    return 0;
+    return efficiency;
 }