]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Always gib monster if killed by mobkill command
authorMario <mario.mario@y7mail.com>
Sun, 15 Sep 2013 07:40:47 +0000 (17:40 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 15 Sep 2013 07:40:47 +0000 (17:40 +1000)
qcsrc/common/monsters/sv_monsters.qc

index 80d9bc92ace3e63828b4c91ea11f72cd86325909..aff04c6dfc69cabdc677ba406e343ec0d11b8987 100644 (file)
@@ -936,7 +936,7 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea
        if(time < self.pain_finished && deathtype != DEATH_KILL)
                return;
 
-       if(time < self.spawnshieldtime)
+       if(time < self.spawnshieldtime && deathtype != DEATH_KILL)
                return;
 
        vector v;
@@ -981,7 +981,7 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea
                frag_target = self;
                MUTATOR_CALLHOOK(MonsterDies);
 
-               if(self.health <= -100) // check if we're already gibbed
+               if(self.health <= -100 || deathtype == DEATH_KILL) // check if we're already gibbed
                {
                        Violence_GibSplash(self, 1, 0.5, attacker);