From: terencehill <piuntn@gmail.com>
Date: Fri, 12 Jun 2020 22:41:03 +0000 (+0200)
Subject: Tweak frozen colorflash effect to be less intrusive, especially during autorevival
X-Git-Tag: xonotic-v0.8.5~688^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=122fc20fd8be1c0988517be5f783c31b33247291;p=xonotic%2Fxonotic-data.pk3dir.git

Tweak frozen colorflash effect to be less intrusive, especially during autorevival
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 05d230669..b8f33d2a1 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -925,9 +925,11 @@ void HUD_Draw(entity this)
 	else if(STAT(FROZEN))
 	{
 		vector col = '0.25 0.90 1';
-		if(STAT(REVIVE_PROGRESS))
-			col += vec3(STAT(REVIVE_PROGRESS), -STAT(REVIVE_PROGRESS), -STAT(REVIVE_PROGRESS));
-		drawfill('0 0 0', vec2(vid_conwidth, vid_conheight), col, autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
+		float col_fade = max(0, STAT(REVIVE_PROGRESS) * 2 - 1);
+		float alpha_fade = 0.3 + 0.7 * (1 - max(0, STAT(REVIVE_PROGRESS) * 4 - 3));
+		if(col_fade)
+			col += vec3(col_fade, -col_fade, -col_fade);
+		drawfill('0 0 0', vec2(vid_conwidth, vid_conheight), col, autocvar_hud_colorflash_alpha * alpha_fade, DRAWFLAG_ADDITIVE);
 	}
 
 	HUD_Scale_Enable();