From: terencehill <piuntn@gmail.com>
Date: Sun, 2 Dec 2012 23:54:05 +0000 (+0100)
Subject: Freezetag: kill the player instead of freezing him if he dies before the game starts... 
X-Git-Tag: xonotic-v0.7.0~61^2~96
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f77a6447646f174834452796285ad412d5d89986;p=xonotic%2Fxonotic-data.pk3dir.git

Freezetag: kill the player instead of freezing him if he dies before the game starts or waiting for next round to start. This avoids that a round starts with frozen players.
---

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index e8ddec8a1..5a2dceeac 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -283,6 +283,12 @@ MUTATOR_HOOKFUNCTION(freezetag_RemovePlayer)
 
 MUTATOR_HOOKFUNCTION(freezetag_PlayerDies)
 {
+	// let the player die in these cases
+	if(time <= game_starttime)
+		return 1;
+	if(next_round || (time > warmup - autocvar_g_freezetag_warmup && time < warmup))
+		return 1;
+
 	if(frag_deathtype == DEATH_HURTTRIGGER)
 	{
 		if(!self.freezetag_frozen)