From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 16 Oct 2011 09:11:18 +0000 (+0300)
Subject: Fix for http://dev.xonotic.org/issues/709 - Damage blur sticking on when switching... 
X-Git-Tag: xonotic-v0.6.0~40^2~30^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de6b7b17ca341321710dba1b07cf26c129df3cd6;p=xonotic%2Fxonotic-data.pk3dir.git

Fix for http://dev.xonotic.org/issues/709 - Damage blur sticking on when switching to chase_active 1 while damaged, even after getting more health. Please note this enables damage blur and the "bloody screen" effect with chase_active 1, although I consider such functionality normal.
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index a90788526..291454a79 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -817,7 +817,7 @@ void CSQC_UpdateView(float w, float h)
 		}
 	}
 	
-	if(autocvar_hud_damage && !autocvar_chase_active)
+	if(autocvar_hud_damage)
 	{
 		splash_size_x = max(vid_conwidth, vid_conheight);
 		splash_size_y = max(vid_conwidth, vid_conheight);
@@ -869,22 +869,25 @@ void CSQC_UpdateView(float w, float h)
 		// pro: matches model better
 		// contra: it's not red because blood is red, but because red is an alarming color, so red should stay
 		// maybe different reddish pics?
-		if(autocvar_cl_gentle_damage || autocvar_cl_gentle)
+		if(autocvar_chase_active >= 0) // not while the event chase camera is active
 		{
-			if(autocvar_cl_gentle_damage == 2)
+			if(autocvar_cl_gentle_damage || autocvar_cl_gentle)
 			{
-				if(myhealth_flash < pain_threshold) // only randomize when the flash is gone
+				if(autocvar_cl_gentle_damage == 2)
 				{
-					myhealth_gentlergb = eX * random() + eY * random() + eZ * random();
+					if(myhealth_flash < pain_threshold) // only randomize when the flash is gone
+					{
+						myhealth_gentlergb = eX * random() + eY * random() + eZ * random();
+					}
 				}
+				else
+					myhealth_gentlergb = stov(autocvar_hud_damage_gentle_color);
+
+				drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, myhealth_gentlergb, autocvar_hud_damage_gentle_alpha_multiplier * bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
 			}
 			else
-				myhealth_gentlergb = stov(autocvar_hud_damage_gentle_color);
-
-			drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, myhealth_gentlergb, autocvar_hud_damage_gentle_alpha_multiplier * bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
+				drawpic(splash_pos, "gfx/blood", splash_size, stov(autocvar_hud_damage_color), bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
 		}
-		else
-			drawpic(splash_pos, "gfx/blood", splash_size, stov(autocvar_hud_damage_color), bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
 
 		if(autocvar_hud_postprocessing)
 		{