]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix slime touch explode not calling MonsterDies mutator hook
authorMario <mario.mario@y7mail.com>
Mon, 13 May 2013 07:17:54 +0000 (17:17 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 13 May 2013 07:17:54 +0000 (17:17 +1000)
qcsrc/server/monsters/monster/slime.qc
qcsrc/server/mutators/gamemode_towerdefense.qc

index ccaf9bf1caa2835be8abb58457d2fdf9198bd73a..e32e40ab8dbaccd8967cb8dd99f88b53d601e6ae 100644 (file)
@@ -37,7 +37,7 @@ void slime_touch_jump()
        if(other.takedamage)
        if(vlen(self.velocity) > 200)
        {
-               slime_dead();
+               Damage (self, world, world, self.health + self.max_health + 200, DEATH_MONSTER_SLIME, self.origin, '0 0 0');
                        
                return;
        }
index 7e905fd3aaa440a3a94dc34a2d7825fffaaad707..1c66c47338704e6feaba969f1829996a5835bed5 100644 (file)
@@ -948,6 +948,15 @@ MUTATOR_HOOKFUNCTION(td_PlayerCommand)
        entity targ = trace_ent;
        if(targ.owner.realowner == self)
                targ = targ.owner;
+               
+       if(cmd_name == "debugmonsters")
+       {
+               float i;
+               for(i = MONSTER_FIRST + 1; i < MONSTER_LAST; ++i)
+                       sprint(self, strcat(ftos(i), " ", ftos(td_moncount[i]), "\n"));
+                       
+               return TRUE;
+       }
        
        if(cmd_name == "turretspawn")
        {