]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Timer turns red as it's about to explode
authorMario <mario.mario@y7mail.com>
Thu, 12 Jun 2014 10:09:19 +0000 (20:09 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 12 Jun 2014 10:09:19 +0000 (20:09 +1000)
qcsrc/client/View.qc

index d4f7c85846a964fe4c0df24f8bdd32fb7575cf53..a069faa46578dd07f5aa3600220bd233400185b6 100644 (file)
@@ -1162,7 +1162,7 @@ void CSQC_UpdateView(float w, float h)
                if(!intermission)
                if(getstatf(STAT_NADE_TIMER) && autocvar_cl_nade_timer) // give nade top priority, as it's a matter of life and death
                {
-                       DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_NADE_TIMER), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
+                       DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_NADE_TIMER), '0.25 0.90 1' + ('1 0 0' * getstatf(STAT_NADE_TIMER)) - ('0 1 1' * getstatf(STAT_NADE_TIMER)), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
                        drawstring_aspect(eY * 0.64 * vid_conheight, ((autocvar_cl_nade_timer == 2) ? _("Nade timer") : ""), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
                }
                else if(getstatf(STAT_REVIVE_PROGRESS))