]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Kill god mode support for clones/corpses.
authorRudolf Polzer <divverent@xonotic.org>
Sun, 11 Jan 2015 15:04:47 +0000 (07:04 -0800)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 11 Jan 2015 15:04:47 +0000 (07:04 -0800)
qcsrc/server/cl_player.qc

index 68239035fe62c42f403c0b9852efa8fdb6b72363..ce6cda2c7e8f9e87b2b9acb9e46e22a9e473b86d 100644 (file)
@@ -174,13 +174,11 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
        if (take > 100)
                Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, self, attacker);
 
-       if (!(self.flags & FL_GODMODE))
-       {
-               self.armorvalue = self.armorvalue - save;
-               self.health = self.health - take;
-               // pause regeneration for 5 seconds
-               self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_health_regen);
-       }
+       self.armorvalue = self.armorvalue - save;
+       self.health = self.health - take;
+       // pause regeneration for 5 seconds
+       self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_health_regen);
+
        self.dmg_save = self.dmg_save + save;//max(save - 10, 0);
        self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
        self.dmg_inflictor = inflictor;