From 1418d148372d2e1af64a118838a70a493a6f2cac Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 1 Mar 2011 16:54:37 +0200 Subject: [PATCH] Fix a last check, and remove the conflict between damage splashes and damage blur, making them independent of one another. --- qcsrc/client/View.qc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 41dd51d1a..afc53901b 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -871,13 +871,15 @@ void CSQC_UpdateView(float w, float h) } } - if not(autocvar_hud_damage && autocvar_hud_postprocessing) + if(autocvar_hud_postprocessing && !autocvar_hud_postprocessing_maxbluralpha) + if(cvar("r_glsl_postprocess_uservec1_enable")) { // don't allow blur to get stuck on if we disable the cvar while damaged cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0"); cvar_set("r_glsl_postprocess_uservec1_enable", "0"); } - if not(autocvar_hud_powerup && autocvar_hud_postprocessing) + if(autocvar_hud_postprocessing && !autocvar_hud_powerup) + if(cvar("r_glsl_postprocess_uservec2_enable")) { // 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"); -- 2.39.2