Add Arena to the mutator system, making use of round_handler. Also add support for...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 23294ed4edc1e8f4c7e0998ee2c14240a95b55d1..9300fe3e3f737a60549925dfbd1670ee0f8c8593 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -439,9 +439,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
        float valid_damage_for_weaponstats;
        float excess;
 
-       if((g_arena && numspawned < 2) && !inWarmupStage)
-               return;
-
        dh = max(self.health, 0);
        da = max(self.armorvalue, 0);
 
@@ -709,9 +706,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                if(defer_ClientKill_Now_TeamChange)
                        ClientKill_Now_TeamChange(); // can turn player into spectator
 
-               if(g_arena)
-                       Spawnqueue_Unmark(self);
-
                // player could have been miraculously resuscitated ;)
                // e.g. players in freezetag get frozen, they don't really die
                if(self.health >= 1 || self.classname != "player")