From: Mario <mario@smbclan.net>
Date: Sun, 3 Jan 2016 12:21:48 +0000 (+1000)
Subject: Gib monsters at -50 health, so they can be gibbed when killed
X-Git-Tag: xonotic-v0.8.2~1314
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21ebd02305f612a66f7ba69e4dbf36e4f8b3eb9f;p=xonotic%2Fxonotic-data.pk3dir.git

Gib monsters at -50 health, so they can be gibbed when killed
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index e95e3d1de..55e453d5d 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -971,7 +971,7 @@ void Monster_Dead_Damage(entity inflictor, entity attacker, float damage, int de
 
 	Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
-	if(self.health <= -100) // 100 health until gone?
+	if(self.health <= -50) // 100 health until gone?
 	{
 		Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index bdfbd4e19..4c155d07d 100644
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -330,8 +330,8 @@ void CommonCommand_editmob(int request, entity caller, int argc)
 
 			if (caller)
 			{
-				makevectors(self.v_angle);
-				WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 100, MOVE_NORMAL, self);
+				makevectors(caller.v_angle);
+				WarpZone_TraceLine(caller.origin + caller.view_ofs, caller.origin + caller.view_ofs + v_forward * 100, MOVE_NORMAL, caller);
 			}
 
 			entity mon = trace_ent;