r4355 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-05 09:12:09 -0400 (Fri, 05 Sep 2008)
New Revision: 4355

Modified:
   trunk/data/qcsrc/server/t_items.qc
Log:
fix trigger_item not taking away items


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-09-05 13:11:00 UTC (rev 4354)
+++ trunk/data/qcsrc/server/t_items.qc	2008-09-05 13:12:09 UTC (rev 4355)
@@ -910,6 +910,11 @@
 	return max(a, b);
 }
 
+float trigger_item_func_bitset(float a, float b)
+{
+	return b;
+}
+
 float trigger_item_func_and(float a, float b)
 {
 	return a & b;
@@ -991,8 +996,8 @@
 		trigger_item_change(0, ammo_cells, trigger_item_func_set, "misc/itempickup.wav", "");
 		trigger_item_change(0, health, trigger_item_func_set, "misc/megahealth.wav", "");
 		trigger_item_change(0, armorvalue, trigger_item_func_set, "misc/armor25.wav", "");
-		trigger_item_change(1, items, trigger_item_func_set, "misc/powerup.wav", "");
-		trigger_item_change(1, weapons, trigger_item_func_set, "weapons/weaponpickup.wav", "");
+		trigger_item_change(1, items, trigger_item_func_bitset, "misc/powerup.wav", "");
+		trigger_item_change(1, weapons, trigger_item_func_bitset, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = time + self.strength_finished;