From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 24 Mar 2016 01:32:52 +0000 (+1100)
Subject: Suppress warning in overkill+lms
X-Git-Tag: xonotic-v0.8.2~1030
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=e947c89d37c2837cb7c68c170d46c91ee3d594b6;p=xonotic%2Fxonotic-data.pk3dir.git

Suppress warning in overkill+lms
---

diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc
index 125025f20..45a7e77f3 100644
--- a/qcsrc/common/mutators/mutator/overkill/overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -135,12 +135,14 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDies)
 	e.pickup_anyway = true;
 	e.spawnfunc_checked = true;
 	spawnfunc_item_armor_small(e);
-	e.movetype = MOVETYPE_TOSS;
-	e.gravity = 1;
-	e.reset = SUB_Remove;
-	setorigin(e, frag_target.origin + '0 0 32');
-	e.velocity = '0 0 200' + normalize(targ.origin - frag_target.origin) * 500;
-	SUB_SetFade(e, time + 5, 1);
+	if (!wasfreed(e)) { // might have been blocked by a mutator
+        e.movetype = MOVETYPE_TOSS;
+        e.gravity = 1;
+        e.reset = SUB_Remove;
+        setorigin(e, frag_target.origin + '0 0 32');
+        e.velocity = '0 0 200' + normalize(targ.origin - frag_target.origin) * 500;
+        SUB_SetFade(e, time + 5, 1);
+	}
 
 	frag_target.ok_lastwep = PS(frag_target).m_switchweapon.m_id;