Invert Vortex charge color

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 98762a03e13f4fe1c96a7a187348fdc069e1d81f..5f3ddfa18e9501f4b421e0b30860c64a70f71ba0 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -22,12 +22,12 @@ METHOD(Vortex, wr_glow, vector(Vortex this, entity actor, entity wepent))
        g.x = f * autocvar_g_weapon_charge_colormod_red_half;
        g.y = f * autocvar_g_weapon_charge_colormod_green_half;
        g.z = f * autocvar_g_weapon_charge_colormod_blue_half;
-       if (charge > animlimit)
+       if (charge < animlimit)
        {
-               f = autocvar_g_weapon_charge_colormod_hdrmultiplier * (charge - animlimit) / (1 - animlimit);
+               f = autocvar_g_weapon_charge_colormod_hdrmultiplier * min(1, charge / animlimit);
                g.x += f * autocvar_g_weapon_charge_colormod_red_full;
-               g.y += f * autocvar_g_weapon_charge_colormod_green_full;
-               g.z += f * autocvar_g_weapon_charge_colormod_blue_full;
+               g.y += fabs(f * autocvar_g_weapon_charge_colormod_green_full);
+               g.z += fabs(f * autocvar_g_weapon_charge_colormod_blue_full);
        }
        // transition color can't be '0 0 0' as it defaults to player model glow color
        if (g == '0 0 0')