From: Mario Date: Tue, 14 May 2013 02:57:27 +0000 (+1000) Subject: Allow revive progress to be used while not frozen X-Git-Tag: xonotic-v0.8.0~241^2^2~235 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a233bfa48d813c2b7bc4c054abdcd422f2f19f4f;p=xonotic%2Fxonotic-data.pk3dir.git Allow revive progress to be used while not frozen --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index cdea18050..cc8efcaff 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -1077,13 +1077,11 @@ void CSQC_UpdateView(float w, float h) //else { if(getstati(STAT_FROZEN)) - { drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); - if(getstatf(STAT_REVIVE_PROGRESS)) - { - DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); - drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL); - } + if(getstatf(STAT_REVIVE_PROGRESS)) + { + DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); + drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL); } if(autocvar_r_letterbox == 0)