r4484 - in trunk/data: . maps qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-22 02:42:25 -0400 (Mon, 22 Sep 2008)
New Revision: 4484

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/maps/basement.bsp
   trunk/data/qcsrc/server/t_items.qc
Log:
allow weaponreplace to entirely remove weapons too


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-09-21 18:51:19 UTC (rev 4483)
+++ trunk/data/defaultNexuiz.cfg	2008-09-22 06:42:25 UTC (rev 4484)
@@ -1129,6 +1129,7 @@
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!
 // example: g_weaponreplace_7 "7 11", then Nexes become MinstaNexes 50% of the times
+// set the cvars to 0 to totally disable a weapon
 set g_weaponreplace_1 ""
 set g_weaponreplace_2 ""
 set g_weaponreplace_3 ""

Modified: trunk/data/maps/basement.bsp
===================================================================
(Binary files differ)

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-09-21 18:51:19 UTC (rev 4483)
+++ trunk/data/qcsrc/server/t_items.qc	2008-09-22 06:42:25 UTC (rev 4484)
@@ -627,6 +627,11 @@
 		}
 		if(t >= 1)
 			wpn = stof(argv(0));
+		if(wpn == 0)
+		{
+			remove(self);
+			return;
+		}
 	}
 
 	e = get_weaponinfo(wpn);