W-turn indicator fixes

Fixed conditions for displaying the indicators.
Fixed the check for if aiming at the angle would put you in the accel
zone, while side strafing.
Made it blue rather than light-blue, so it's not confused with the angle
indicator, which is also light-blue by default when in an accel zone.

diff --git a/_hud_common.cfg b/_hud_common.cfg
index 35b53e928d7653912ac955e42f91288e13b38858..a2676944046550bfc6572956ed9cbabd0afc3fd6 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -201,7 +201,7 @@ seta hud_panel_strafehud_switch_minspeed "-1" "minimum speed in qu/s at which an
 seta hud_panel_strafehud_switch_color "1 1 0" "color of the strafe angle indicators for changing strafe direction"
 seta hud_panel_strafehud_switch_alpha "0.5" "opacity of the strafe angle indicators for changing strafe direction"
 seta hud_panel_strafehud_wturn "1" "enable the W-turn indicators showing the angle to rotate your velocity as fast as possible, 1 = only if W-turning, 2 = also while strafing normally, 3 = also while side strafing"
-seta hud_panel_strafehud_wturn_color "0 1 1" "color of the W-turn indicators"
+seta hud_panel_strafehud_wturn_color "0 0 1" "color of the W-turn indicators"
 seta hud_panel_strafehud_wturn_alpha "0.5" "opacity of the W-turn indicators"
 seta hud_panel_strafehud_wturn_proper "0" "use the proper formula to calculate W-turn indicators (warning: loses accuracy at high speeds)"
 seta hud_panel_strafehud_wturn_unrestricted "0" "set to 1 to enable the W-turn indicators even when W-turning gives acceleration (warning: not completely accurate)"

diff --git a/qcsrc/client/hud/panel/strafehud.qc b/qcsrc/client/hud/panel/strafehud.qc
index 6159f022b296c7f1a767f71cc238902c80e32a35..45a8fb3198b4f6fc11dc228cf5bc52192f5c51dc 100644 (file)
--- a/qcsrc/client/hud/panel/strafehud.qc
+++ b/qcsrc/client/hud/panel/strafehud.qc
@@ -402,7 +402,8 @@ void HUD_StrafeHUD()
        float absolute_overturnangle = overturnangle;
 
        float aircontrol = PHYS_AIRCONTROL(strafeplayer);
-       bool aircontrol_backwards = PHYS_AIRCONTROL_BACKWARDS(strafeplayer) == 1;
+       bool aircontrol_backwards = PHYS_AIRCONTROL_BACKWARDS(strafeplayer);
+       bool is_aircontrol_keys = keys_fwd == STRAFEHUD_KEYS_FORWARD || (aircontrol_backwards && keys_fwd == STRAFEHUD_KEYS_BACKWARD);
        bool is_aircontrol_direction = fwd || aircontrol_backwards;
        bool airaccel_qw = PHYS_AIRACCEL_QW(strafeplayer) == 1;
 
@@ -421,7 +422,7 @@ void HUD_StrafeHUD()
         * ... so the angle will only be shown with hud_panel_strafehud_wturn_proper 0
         * this doesn't have support for sv_aircontrol_sideways == 1
         */
-       bool wturning = (wishangle == 0) && !onground && is_aircontrol_direction;
+       bool wturning = (wishangle == 0) && !onground && is_aircontrol_keys;
        bool wturn_valid = false;
        float wturn_bestangle = 0;
        if(autocvar_hud_panel_strafehud_wturn && moving &&
@@ -449,9 +450,10 @@ void HUD_StrafeHUD()
 
        // draw the switch indicators as if strafing normally (W+A style), while W-turning or side strafing
        float n_bestangle = 0;
+       float absolute_n_prebestangle = 0; // also needed for W-turn angles
        bool draw_normal = ((autocvar_hud_panel_strafehud_switch >= STRAFEHUD_SWITCH_NORMAL && wturning)
                || (autocvar_hud_panel_strafehud_switch == STRAFEHUD_SWITCH_SIDESTRAFE && turn));
-       if(draw_normal)
+       if(draw_normal || wturn_valid)
        {
                // recalculate bestangle as if strafing normally
                float n_maxspeed  = PHYS_MAXAIRSPEED(strafeplayer) * maxspeed_mod;
@@ -461,6 +463,9 @@ void HUD_StrafeHUD()
                n_bestangle = speed > n_bestspeed
                        ? acos(n_bestspeed / speed) * RAD2DEG - 45
                        : -45;
+               absolute_n_prebestangle = speed > n_movespeed
+                       ? acos(n_movespeed / speed) * RAD2DEG
+                       : 0;
        }
 
        float hudangle = StrafeHUD_DetermineHudAngle(absolute_wishangle, absolute_overturnangle, strafity);
@@ -661,9 +666,9 @@ void HUD_StrafeHUD()
                }
 
                // only draw wturn indicators if conditions were met
-               if(wturn_valid && is_aircontrol_direction && !onground &&
+               if(wturn_valid && !onground && is_aircontrol_direction &&
                        autocvar_hud_panel_strafehud_wturn_alpha > 0 &&
-                       absolute_wturn_bestangle < absolute_prebestangle &&
+                       absolute_wturn_bestangle < absolute_n_prebestangle &&
                        ((autocvar_hud_panel_strafehud_wturn && wturning) ||
                        (autocvar_hud_panel_strafehud_wturn == STRAFEHUD_WTURN_NORMAL && !turn) ||
                        (autocvar_hud_panel_strafehud_wturn == STRAFEHUD_WTURN_SIDESTRAFE)))

diff --git a/qcsrc/client/hud/panel/strafehud.qh b/qcsrc/client/hud/panel/strafehud.qh
index eefb6b66fa0f1511a141a76e957607f90cd14711..bfc25ad7990325194cd4e609d1cdb3bee4a8092a 100644 (file)
--- a/qcsrc/client/hud/panel/strafehud.qh
+++ b/qcsrc/client/hud/panel/strafehud.qh
@@ -43,7 +43,7 @@ float autocvar_hud_panel_strafehud_switch_minspeed = -1;
 vector autocvar_hud_panel_strafehud_switch_color = '1 1 0';
 float autocvar_hud_panel_strafehud_switch_alpha = 0.5;
 int autocvar_hud_panel_strafehud_wturn = 1;
-vector autocvar_hud_panel_strafehud_wturn_color = '0 1 1';
+vector autocvar_hud_panel_strafehud_wturn_color = '0 0 1';
 float autocvar_hud_panel_strafehud_wturn_alpha = 0.5;
 bool autocvar_hud_panel_strafehud_wturn_proper = false;
 bool autocvar_hud_panel_strafehud_wturn_unrestricted = false;