Fix some things with the sharpen effect

[voretournament/voretournament.git] / data / qcsrc / client / View.qc

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index aabe319c0fa1f876509b8cbb508b7407432cacf2..73a9f4da8d10a52848c3f8d93bd83d1ab35afbf5 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -635,18 +635,18 @@ void CSQC_UpdateView(float w, float h)
                        cvar_set("r_glsl_postprocess_uservec1_enable", "0");\r
                }\r
 \r
-               if(cvar("hud_postprocessing_maxsharpenalpha"))\r
+               if(cvar("hud_powerup"))\r
                {\r
                        float sharpen_intensity;\r
                        if (getstatf(STAT_STRENGTH_FINISHED) - time > 0)\r
                                sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time);\r
                        if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0)\r
                                sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time);\r
-                       sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so match it\r
+                       sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so fade the effect from there\r
 \r
                        if(sharpen_intensity > 0)\r
                        {\r
-                               cvar_set("r_glsl_postprocess_uservec2", strcat("1 ", ftos(-sharpen_intensity * cvar("hud_postprocessing_maxsharpenalpha")), " 0 0"));\r
+                               cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0"));\r
                                cvar_set("r_glsl_postprocess_uservec2_enable", "1");\r
                        }\r
                        else\r
@@ -663,7 +663,7 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");\r
                cvar_set("r_glsl_postprocess_uservec1_enable", "0");\r
        }\r
-       if not(cvar("hud_postprocessing_maxsharpenalpha") && cvar("hud_postprocessing"))\r
+       if not(cvar("hud_powerup") && cvar("hud_postprocessing"))\r
        {\r
                // don't allow sharpen to get stuck on if we disable the cvar while powered up\r
                cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");\r