From: FruitieX <fruitiex@gmail.com>
Date: Wed, 17 Nov 2010 18:28:34 +0000 (+0200)
Subject: add a master switch cvar and a custom color cvar
X-Git-Tag: xonotic-v0.1.0preview~122^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d899ca3fafd91ac03ae27410b750bcd183084a81;p=xonotic%2Fxonotic-data.pk3dir.git

add a master switch cvar and a custom color cvar
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c6f14bcb6..a0f6feb5f 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1368,6 +1368,8 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_ch
 seta hud_showbinds 1	"the way to show the keys to press in HUD messages: 0 displays commands, 1 bound keys, 2 both"
 seta hud_showbinds_limit 2	"maximum number of bound keys to show for a command. 0 for unlimited"
 
+seta hud_damage 1 "an improved version of gl_polyblend, draw an image instead when hurt"
+seta hud_damage_color "1 0 0" "color of flash"
 seta hud_damage_factor 0.05 "(damage * factor) = how much to add to the alpha value"
 seta hud_damage_fade_rate 1 "how much to subtract from the alpha value each second"
 seta hud_damage_maxalpha 2 "how much to limit the alpha value to"
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 8f684cc06..083eec1b8 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -664,48 +664,51 @@ void CSQC_UpdateView(float w, float h)
 	}
 
 	// improved polyblend
-	float myhealth_flash_temp;
-	myhealth = getstati(STAT_HEALTH);
+	if(cvar("hud_damage"))
+	{
+		float myhealth_flash_temp;
+		myhealth = getstati(STAT_HEALTH);
 
-	// fade out
-	myhealth_flash = max(0, myhealth_flash - cvar("hud_damage_fade_rate") * frametime);
-	// add new damage
-	myhealth_flash = bound(0, myhealth_flash + max(0, myhealth_prev - myhealth) * cvar("hud_damage_factor"), cvar("hud_damage_maxalpha"));
+		// fade out
+		myhealth_flash = max(0, myhealth_flash - cvar("hud_damage_fade_rate") * frametime);
+		// add new damage
+		myhealth_flash = bound(0, myhealth_flash + max(0, myhealth_prev - myhealth) * cvar("hud_damage_factor"), cvar("hud_damage_maxalpha"));
 
-	float pain_treshold, pain_treshold_lower, pain_treshold_lower_health;
-	pain_treshold = cvar("hud_damage_pain_treshold");
-	pain_treshold_lower = cvar("hud_damage_pain_treshold_lower");
-	pain_treshold_lower_health = cvar("hud_damage_pain_treshold_lower_health");
+		float pain_treshold, pain_treshold_lower, pain_treshold_lower_health;
+		pain_treshold = cvar("hud_damage_pain_treshold");
+		pain_treshold_lower = cvar("hud_damage_pain_treshold_lower");
+		pain_treshold_lower_health = cvar("hud_damage_pain_treshold_lower_health");
 
-	if(pain_treshold_lower && myhealth < pain_treshold_lower_health)
-	{
-		pain_treshold = pain_treshold - max(cvar("hud_damage_pain_treshold_pulsating_min"), fabs(sin(M_PI * time / cvar("hud_damage_pain_treshold_pulsating_period")))) * pain_treshold_lower * (1 - max(0, myhealth)/pain_treshold_lower_health);
-	}
+		if(pain_treshold_lower && myhealth < pain_treshold_lower_health)
+		{
+			pain_treshold = pain_treshold - max(cvar("hud_damage_pain_treshold_pulsating_min"), fabs(sin(M_PI * time / cvar("hud_damage_pain_treshold_pulsating_period")))) * pain_treshold_lower * (1 - max(0, myhealth)/pain_treshold_lower_health);
+		}
 
-	myhealth_flash_temp = bound(0, myhealth_flash - pain_treshold, 1);
+		myhealth_flash_temp = bound(0, myhealth_flash - pain_treshold, 1);
 
-	if(myhealth_prev < 1)
-	{
-		if(myhealth >= 1)
+		if(myhealth_prev < 1)
 		{
-			myhealth_flash = 0; // just spawned, clear the flash immediately
-			myhealth_flash_temp = 0;
+			if(myhealth >= 1)
+			{
+				myhealth_flash = 0; // just spawned, clear the flash immediately
+				myhealth_flash_temp = 0;
+			}
+			else
+			{
+				myhealth_flash += cvar("hud_damage_fade_rate") * frametime; // dead
+			}
 		}
-		else
+
+		if(spectatee_status == -1 || intermission)
 		{
-			myhealth_flash += cvar("hud_damage_fade_rate") * frametime; // dead
+			myhealth_flash = 0; // observing, or match ended
+			myhealth_flash_temp = 0;
 		}
-	}
 
-	if(spectatee_status == -1 || intermission)
-	{
-		myhealth_flash = 0; // observing, or match ended
-		myhealth_flash_temp = 0;
-	}
+		myhealth_prev = myhealth;
 
-	myhealth_prev = myhealth;
-
-	drawpic(reticle_pos, "gfx/blood", reticle_size, '1 0 0', bound(0, myhealth_flash_temp, 1), DRAWFLAG_NORMAL);
+		drawpic(reticle_pos, "gfx/blood", reticle_size, stov(cvar_string("hud_damage_color")), bound(0, myhealth_flash_temp, 1), DRAWFLAG_NORMAL);
+	}
 
 	// Draw the mouse cursor
 	// NOTE: drawpic must happen after R_RenderScene for some reason