From: terencehill <piuntn@gmail.com>
Date: Sat, 17 Jun 2017 19:47:17 +0000 (+0200)
Subject: Add another vec3 and rearrange code to shorten instructions
X-Git-Tag: xonotic-v0.8.5~2699^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7232fc35dee19dc5f227f8ac423e4f66357d0f3d;p=xonotic%2Fxonotic-data.pk3dir.git

Add another vec3 and rearrange code to shorten instructions
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 651d0c3b2..d624b4eef 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1364,14 +1364,18 @@ void HUD_Draw(entity this)
 	}
 	else if(STAT(FROZEN))
 	{
-		drawfill('0 0 0', vec2(vid_conwidth, vid_conheight), ((STAT(REVIVE_PROGRESS)) ? ('0.25 0.90 1' + ('1 0 0' * STAT(REVIVE_PROGRESS)) + ('0 1 1' * STAT(REVIVE_PROGRESS) * -1)) : '0.25 0.90 1'), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
+		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);
 	}
 
 	HUD_Scale_Enable();
 	if(!intermission)
 	if(STAT(NADE_TIMER) && autocvar_cl_nade_timer) // give nade top priority, as it's a matter of life and death
 	{
-		DrawCircleClippedPic(vec2(0.5 * vid_conwidth, 0.6 * vid_conheight), 0.1 * vid_conheight, "gfx/crosshair_ring.tga", STAT(NADE_TIMER), '0.25 0.90 1' + vec3(STAT(NADE_TIMER), -STAT(NADE_TIMER), -STAT(NADE_TIMER)), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
+		vector col = '0.25 0.90 1' + vec3(STAT(NADE_TIMER), -STAT(NADE_TIMER), -STAT(NADE_TIMER));
+		DrawCircleClippedPic(vec2(0.5 * vid_conwidth, 0.6 * vid_conheight), 0.1 * vid_conheight, "gfx/crosshair_ring.tga", STAT(NADE_TIMER), col, autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
 		drawstring_aspect(eY * 0.64 * vid_conheight, ((autocvar_cl_nade_timer == 2) ? _("Nade timer") : ""), vec2(vid_conwidth, 0.025 * vid_conheight), '1 1 1', 1, DRAWFLAG_NORMAL);
 	}
 	else if(STAT(CAPTURE_PROGRESS))