]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Gib monsters at -50 health, so they can be gibbed when killed
authorMario <mario@smbclan.net>
Sun, 3 Jan 2016 12:21:48 +0000 (22:21 +1000)
committerMario <mario@smbclan.net>
Sun, 3 Jan 2016 12:21:48 +0000 (22:21 +1000)
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/command/common.qc

index e95e3d1dea3ed0fddda349db2c98dd692478eb78..55e453d5d5dd91373b9089bda41cf8cca808a4f3 100644 (file)
@@ -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);
 
index bdfbd4e199238f9aeb3c16d1fc15365e4b6e0015..4c155d07d5bd9f5d071fb412867c91abe7791e59 100644 (file)
@@ -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;