From ab8bd5145767270d2abbf10d12c91b4216edfdf5 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 18 Dec 2012 01:43:54 +0100 Subject: [PATCH] Freezetag: finally enable rounds in warmup stage as now they work well there too, removing the auto-unfreeze after 5 seconds feature --- qcsrc/server/mutators/gamemode_freezetag.qc | 4 ++-- qcsrc/server/round_handler.qc | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 1629c6884..1aad9d3c8 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -153,8 +153,8 @@ void freezetag_Freeze(entity attacker) self.freezetag_frozen = 1; self.freezetag_revive_progress = 0; self.health = 1; - if(inWarmupStage) - self.freezetag_frozen_timeout = time + 5; + // if(inWarmupStage) + // self.freezetag_frozen_timeout = time + 5; freezetag_count_alive_players(); diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index 9f7f939dc..622347c53 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -3,9 +3,11 @@ void round_handler_Think() entity e; float f; - if(inWarmupStage || time < game_starttime) + if(time < game_starttime) { - self.nextthink = time + 1; + self.wait = FALSE; + round_handler_ResetCountdown(); + self.nextthink = game_starttime + 1; return; } @@ -89,7 +91,7 @@ void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, f float round_handler_IsActive() { - return (round_handler && !inWarmupStage && time > game_starttime); + return (round_handler && time > game_starttime); } float round_handler_AwaitingNextRound() -- 2.39.2