From: Mario <mario.mario@y7mail.com>
Date: Wed, 4 Sep 2013 17:21:48 +0000 (+1000)
Subject: Use a hack to remove dropped items on pickup
X-Git-Tag: xonotic-v0.8.0~241^2^2~84
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d371fa91072ce8dff796cb10ba8b98fe703b8f71;p=xonotic%2Fxonotic-data.pk3dir.git

Use a hack to remove dropped items on pickup
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 6638dc3a8..ec40944d5 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -3,16 +3,6 @@
 // =========================
 
 
-void M_Item_Touch ()
-{
-	if(self && IS_PLAYER(other) && other.deadflag == DEAD_NO)
-	{
-		Item_Touch();
-		self.think = SUB_Remove;
-		self.nextthink = time + 0.1;
-	}
-}
-
 void monster_item_spawn()
 {
 	if(self.monster_loot)
@@ -20,7 +10,7 @@ void monster_item_spawn()
 
 	self.gravity = 1;
 	self.velocity = randomvec() * 175 + '0 0 325';
-	self.touch = M_Item_Touch;
+	self.classname = "droppedweapon"; // hax
 
 	SUB_SetFade(self, time + autocvar_g_monsters_drop_time, 1);
 }