Use different content blur cvars for the stomach

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index bc25fc9faecd76e7d0c1e71fee912d561ea45966..cc23364add92d2c7c05144d97e879e80b0be2b81 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1094,8 +1094,10 @@ seta hud_postprocessing_maxbluralpha 0.5 "maximum alpha which the blur postproce
 seta hud_postprocessing_maxblurradius 10 "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_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur"\r
-seta hud_contents_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"\r
+seta hud_contents_liquid_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur"\r
+seta hud_contents_liquid_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"\r
+seta hud_contents_stomach_blur 2 "Use postprocessing to blur the screen when you are inside the stomach. Higher values = more blur"\r
+seta hud_contents_stomach_blur_alpha 0.2 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"\r
 seta hud_contents_factor 1 "factor at which to multiply the current faded value."\r
 seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level to reach normal value when entering the liquid"\r
 seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 37926193de12c2cd1d3dfe33b0c19105096cbef5..41cfb5766b8eba9b91543ade8d0ac2609dab39f8 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -516,11 +516,20 @@ void CSQC_UpdateView(float w, float h)
 \r
                if(cvar("hud_postprocessing"))\r
                {\r
-                       if(cvar("hud_contents_blur"))\r
+                       if(cvar("hud_contents_liquid_blur"))\r
                        {\r
+                               // when inside the stomach, we use different blur settings than when we're inside other fluids\r
                                content_blurpostprocess_x = 1;\r
-                               content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_blur");\r
-                               content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_blur_alpha");\r
+                               if(getstati(STAT_VORE_EATEN))\r
+                               {\r
+                                       content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_stomach_blur");\r
+                                       content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_stomach_blur_alpha");\r
+                               }\r
+                               else\r
+                               {\r
+                                       content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_liquid_blur");\r
+                                       content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_liquid_blur_alpha");\r
+                               }\r
                        }\r
                        else\r
                        {\r