From e965ca68ddd8dee2d7d83ff2781a89547fb30496 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 16 Mar 2009 07:28:48 +0000
Subject: [PATCH] in weapon arena, spawn powerups and health and armor again
 (these can still be turned off by separate cvars)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6188 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/t_items.qc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 6a500465d..74588b1ec 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -473,7 +473,13 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 
 		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);
-- 
2.39.2