[nexuiz-commits] r6188 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-16 03:28:48 -0400 (Mon, 16 Mar 2009)
New Revision: 6188

Modified:
   trunk/data/qcsrc/server/t_items.qc
Log:
in weapon arena, spawn powerups and health and armor again (these can still be turned off by separate cvars)


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-03-16 07:24:22 UTC (rev 6187)
+++ trunk/data/qcsrc/server/t_items.qc	2009-03-16 07:28:48 UTC (rev 6188)
@@ -473,12 +473,18 @@
 
 		weaponsInMap |= weaponid;
 
-		if(g_lms || g_weaponarena)
+		if(g_lms)
 		{
 			startitem_failed = TRUE;
 			remove(self);
 			return;
 		}
+		else if (g_weaponarena && ((weaponid & WEPBIT_ALL) || (itemid & IT_AMMO)))
+		{
+			startitem_failed = TRUE;
+			remove(self);
+			return;
+		}
 		else if (g_minstagib)
 		{
 			// don't remove dropped items and powerups