From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 26 Feb 2011 01:13:36 +0000 (+0200)
Subject: Fix some things with the sharpen effect
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d5338efdc61313a7a6a5b21e9adbdf32ddf79ca;p=voretournament%2Fvoretournament.git

Fix some things with the sharpen effect
---

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 984d53b4..41434050 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1082,6 +1082,7 @@ seta hud_damage_pain_threshold_lower 1.5 "how much we lower pain_threshold with
 seta hud_damage_pain_threshold_lower_health 50 "at which health we start lowering pain_threshold"
 seta hud_damage_pain_threshold_pulsating_min 0.6 "minimum value when calculating the pulse: max(pulsating_min, fabs(sin(PI * time / period))"
 seta hud_damage_pain_threshold_pulsating_period 0.8 "one pulse every X seconds"
+seta hud_powerup 0.5 "power of the sharpen effect when owning the shield or strength powerups"
 
 seta hud_stomach 0.65 "displays a splash on the screen when inside the stomach, value specifies alpha"
 seta hud_stomach_color "0.75 1 0" "color of the stomach screen splash"
@@ -1091,7 +1092,6 @@ seta hud_stomach_fade_out 0.03 "how quickly the stomach splash disappears when y
 seta hud_postprocessing 1 "enables the ability for effects such as hud_damage_blur and hud_contents to apply a postprocessing method upon the screen - enabling this disables manual editing of the postprocess cvars"
 seta hud_postprocessing_maxbluralpha 0.5 "maximum alpha which the blur postprocess can be"
 seta hud_postprocessing_maxblurradius 10 "maximum radius which the blur postprocess can be"
-seta hud_postprocessing_maxsharpenalpha 0.75 "maximum alpha which the sharpen postprocess can be"
 
 seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid"
 seta hud_contents_factor 1 "factor at which to multiply the current faded value."
diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index aabe319c..73a9f4da 100644
--- 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");
 		}
 
-		if(cvar("hud_postprocessing_maxsharpenalpha"))
+		if(cvar("hud_powerup"))
 		{
 			float sharpen_intensity;
 			if (getstatf(STAT_STRENGTH_FINISHED) - time > 0)
 				sharpen_intensity += (getstatf(STAT_STRENGTH_FINISHED) - time);
 			if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0)
 				sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time);
-			sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so match it
+			sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so fade the effect from there
 
 			if(sharpen_intensity > 0)
 			{
-				cvar_set("r_glsl_postprocess_uservec2", strcat("1 ", ftos(-sharpen_intensity * cvar("hud_postprocessing_maxsharpenalpha")), " 0 0"));
+				cvar_set("r_glsl_postprocess_uservec2", strcat("0 ", ftos(-sharpen_intensity * cvar("hud_powerup")), " 0 0"));
 				cvar_set("r_glsl_postprocess_uservec2_enable", "1");
 			}
 			else
@@ -663,7 +663,7 @@ void CSQC_UpdateView(float w, float h)
 		cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");
 		cvar_set("r_glsl_postprocess_uservec1_enable", "0");
 	}
-	if not(cvar("hud_postprocessing_maxsharpenalpha") && cvar("hud_postprocessing"))
+	if not(cvar("hud_powerup") && cvar("hud_postprocessing"))
 	{
 		// don't allow sharpen to get stuck on if we disable the cvar while powered up
 		cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");