From d04af9953eae59faecae3aca2cc1182dd1adec1f Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 7 May 2013 19:17:26 +1000 Subject: [PATCH] Fix frozen revive screen brightness --- qcsrc/client/View.qc | 5 +---- qcsrc/server/monsters/lib/monsters.qc | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index d75635037..119aa32ea 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -1074,11 +1074,8 @@ 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)) { - 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); + 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); diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index 2e25b2004..83621fd00 100644 --- a/qcsrc/server/monsters/lib/monsters.qc +++ b/qcsrc/server/monsters/lib/monsters.qc @@ -560,7 +560,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ monster_speed_run = runspeed; monster_speed_walk = walkspeed; - if(MUTATOR_CALLHOOK(MonsterMove) || gameover || time < game_starttime || (autocvar_g_campaign && !campaign_bots_may_start) || time < self.spawn_time) + if(MUTATOR_CALLHOOK(MonsterMove) || gameover || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || time < game_starttime || (autocvar_g_campaign && !campaign_bots_may_start) || time < self.spawn_time) { runspeed = walkspeed = 0; if(time >= self.spawn_time) -- 2.39.2