r4398 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-07 09:48:05 -0400 (Sun, 07 Sep 2008)
New Revision: 4398

Modified:
   trunk/data/qcsrc/server/t_items.qc
Log:
fix typo breaking trigger_items


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-09-07 13:46:21 UTC (rev 4397)
+++ trunk/data/qcsrc/server/t_items.qc	2008-09-07 13:48:05 UTC (rev 4398)
@@ -1005,8 +1005,8 @@
 		target_item_change(0, ammo_cells, target_item_func_set, "misc/itempickup.wav", "");
 		target_item_change(0, health, target_item_func_set, "misc/megahealth.wav", "");
 		target_item_change(0, armorvalue, target_item_func_set, "misc/armor25.wav", "");
-		target_item_change(1, items, target_item_func_bitset, "misc/powerup.wav", "");
-		target_item_change(1, weapons, target_item_func_itembitset, "weapons/weaponpickup.wav", "");
+		target_item_change(1, items, target_item_func_itembitset, "misc/powerup.wav", "");
+		target_item_change(1, weapons, target_item_func_bitset, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = time + self.strength_finished;
@@ -1021,8 +1021,8 @@
 		target_item_change(0, ammo_cells, target_item_func_min, "misc/itempickup.wav", "");
 		target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
 		target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
-		target_item_change(1, items, target_item_func_and, "misc/powerup.wav", "");
-		target_item_change(1, weapons, target_item_func_itemand, "weapons/weaponpickup.wav", "");
+		target_item_change(1, items, target_item_func_itemand, "misc/powerup.wav", "");
+		target_item_change(1, weapons, target_item_func_and, "weapons/weaponpickup.wav", "");
 
 		if((self.items & activator.items) & IT_STRENGTH)
 			activator.strength_finished = min(activator.strength_finished, time + self.strength_finished);