From: Mario <mario.mario@y7mail.com>
Date: Mon, 13 May 2013 07:17:54 +0000 (+1000)
Subject: Fix slime touch explode not calling MonsterDies mutator hook
X-Git-Tag: xonotic-v0.8.0~241^2^2~238
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a7ab36ec11e42de19b4dd9f818b5210e89d3fde0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix slime touch explode not calling MonsterDies mutator hook
---

diff --git a/qcsrc/server/monsters/monster/slime.qc b/qcsrc/server/monsters/monster/slime.qc
index ccaf9bf1c..e32e40ab8 100644
--- a/qcsrc/server/monsters/monster/slime.qc
+++ b/qcsrc/server/monsters/monster/slime.qc
@@ -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;
 	}
diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index 7e905fd3a..1c66c4733 100644
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -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")
 	{