Freezetag: finally enable rounds in warmup stage as now they work well there too...

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 1629c688400d5acb311fb91c6a6862eef48999ac..1aad9d3c890b0dafb69f492878ad3bfa04638c52 100644 (file)
--- 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 9f7f939dcca9982f51211cc9cf56026dfe5936b1..622347c534ff65900b10186bf8821809a9d9c3f8 100644 (file)
--- 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()