From: terencehill Date: Sat, 17 Nov 2012 22:40:38 +0000 (+0100) Subject: Avoid freezing the first player who joins the game in freezetag, there's no need X-Git-Tag: xonotic-v0.7.0~61^2~120 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e95b266fe0cd4d1d58325f5c69ed12344388b914;p=xonotic%2Fxonotic-data.pk3dir.git Avoid freezing the first player who joins the game in freezetag, there's no need --- diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index de325c3d1..8a00f52a7 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -302,7 +302,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn) { - if(time <= game_starttime) + if(time <= game_starttime || total_players == 0) return 1; freezetag_Unfreeze(world); // start by making sure that all ice blocks are removed @@ -313,6 +313,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn) next_round = time; return 1; } + if(warmup && time > warmup) // spawn too late, freeze player { centerprint(self, "^1You spawned after the round started, you'll spawn as frozen.\n");