From 2fcfa1f87f66c6c985e667852146bb8a4c444ac1 Mon Sep 17 00:00:00 2001 From: mrbougo Date: Sat, 30 May 2009 09:37:55 +0000 Subject: [PATCH] items that aren't picked up should not spawn particles on touch git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6800 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/t_items.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index 7230323c2..c37890df8 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -364,11 +364,11 @@ void Item_Touch (void) if (self.owner == other) return; - pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1); - if(!Item_GiveTo(self, other)) return; + pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1); + if (self.classname == "droppedweapon") remove (self); else if((self.flags & FL_WEAPON) && !(self.flags & FL_NO_WEAPON_STAY) && g_weapon_stay) -- 2.39.2