Fix a few other checks and things regarding the blur effect

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 6db167205d4d89028d61979d5d016bf737d44912..68b810168892c1dc1fdc4112f1f29b274377b8d2 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1106,7 +1106,7 @@ seta hud_stomach_fade_out 0.03 "how quickly the stomach splash disappears when y
 \r
 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"\r
 seta hud_postprocessing_maxbluralpha 0.5 "maximum alpha which the blur postprocess can be"\r
-seta hud_postprocessing_maxblurradius 10 "maximum radius which the blur postprocess can be"\r
+seta hud_postprocessing_maxblurradius 8 "maximum radius which the blur postprocess can be"\r
 \r
 seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid"\r
 seta hud_contents_liquid_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 3e21c77e511f25ec928937d5af581c9dddcb3030..7bf9b48af180224946f1099e8bb1347350368825 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -740,13 +740,15 @@ void CSQC_UpdateView(float w, float h)
                }\r
        }\r
 \r
-       if not(cvar("hud_damage") && cvar("hud_postprocessing"))\r
+       if(cvar("hud_postprocessing") && !cvar("hud_postprocessing_maxbluralpha"))\r
+       if(cvar("r_glsl_postprocess_uservec1_enable"))\r
        {\r
                // don't allow blur to get stuck on if we disable the cvar while damaged\r
                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_powerup") && cvar("hud_postprocessing"))\r
+       if(cvar("hud_postprocessing") && !cvar("hud_powerup"))\r
+       if(cvar("r_glsl_postprocess_uservec2_enable"))\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

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index f3f493ebb89247e0d8e1874dc490897eb88b07ea..2558a0ac6a630988f6cdf046e117b48ffc84622e 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -173,10 +173,9 @@ void fillVoretEffectsSettingsTab(entity me)
                        e.savedValue = 0.5; // default\r
                me.TD(me, 1, 2, s);\r
        me.TR(me);\r
-               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.65, 0, "hud_damage", "Screen splashes & Blur")); // must match defaults\r
-               makeMulti(e, "hud_stomach");\r
+               me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Screen blur")); // must match defaults\r
                me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Sharpening")); // must match defaults\r
-       \r
+\r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));\r
 }\r