strafehud: move minimum hud angle calculation into hud angle function

diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc
index 854197399617c39876eb5ed6e21bb8a0445fd8fa..ec4893bce741c7a0cb770f70931e413b76303832 100644 (file)
--- a/qcsrc/client/hud/panel/strafehud.qc
+++ b/qcsrc/client/hud/panel/strafehud.qc
@@ -164,13 +164,7 @@ void HUD_StrafeHUD()
                float wishangle = StrafeHUD_DetermineWishAngle(movement, keys, islocal);
                bool strafekeys = fabs(wishangle) > 45;
 
-               // determine minimum required angle to display full strafe range
-               float range_minangle = fabs(wishangle) % 90; // maximum range is 90 degree
-               if(range_minangle > 45) range_minangle = 45 - fabs(wishangle) % 45; // minimum angle range is 45
-               range_minangle = 90 - range_minangle; // calculate value which is never >90 or <45
-               range_minangle *= 2; // multiply to accommodate for both sides of the hud
-
-               float hudangle = StrafeHUD_DetermineHudAngle(range_minangle);
+               float hudangle = StrafeHUD_DetermineHudAngle(wishangle);
 
                // detect air strafe turning
                static bool turn = false;

diff --git a/qcsrc/client/hud/panel/strafehud/util.qc b/qcsrc/client/hud/panel/strafehud/util.qc
index 02adbdbc2dceae8b18b065fd0449097511348788..74704685ef7a173fbe071f238d838a3737258d94 100644 (file)
--- a/qcsrc/client/hud/panel/strafehud/util.qc
+++ b/qcsrc/client/hud/panel/strafehud/util.qc
@@ -203,7 +203,7 @@ float StrafeHUD_DetermineWishAngle(vector movement, int keys, bool islocal)
        return wishangle;
 }
 
-float StrafeHUD_DetermineHudAngle(float range_minangle)
+float StrafeHUD_DetermineHudAngle(float wishangle)
 {
        float hudangle;
        if(isnan(autocvar_hud_panel_strafehud_range))
@@ -213,9 +213,19 @@ float StrafeHUD_DetermineHudAngle(float range_minangle)
        else if(autocvar_hud_panel_strafehud_range == 0)
        {
                if(autocvar__hud_configure)
+               {
                        hudangle = 90;
+               }
                else
+               {
+                       // determine minimum required angle to display full strafe range
+                       float range_minangle = fabs(wishangle) % 90; // maximum range is 90 degree
+                       if(range_minangle > 45) range_minangle = 45 - fabs(wishangle) % 45; // minimum angle range is 45
+                       range_minangle = 90 - range_minangle; // calculate value which is never >90 or <45
+                       range_minangle *= 2; // multiply to accommodate for both sides of the hud
+
                        hudangle = range_minangle; // use minimum angle required if dynamically setting hud angle
+               }
        }
        else if(autocvar_hud_panel_strafehud_range < 0)
        {