]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Freezetag: kill the player instead of freezing him if he dies before the game starts...
authorterencehill <piuntn@gmail.com>
Sun, 2 Dec 2012 23:54:05 +0000 (00:54 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 3 Dec 2012 00:08:19 +0000 (01:08 +0100)
qcsrc/server/mutators/gamemode_freezetag.qc

index e8ddec8a165cfb513570ce2e31d48850e698917f..5a2dceeacc9015b02145e1eefee06a8f82fc0652 100644 (file)
@@ -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)