From: terencehill <piuntn@gmail.com>
Date: Mon, 29 Aug 2011 20:13:07 +0000 (+0200)
Subject: Make g_pickup_weapons_anyway totally incompatible with g_weapon_stay. It only causes... 
X-Git-Tag: xonotic-v0.5.0~14^2~2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=828daee687fc65250cf7079980f8aed0bfdf419e;p=xonotic%2Fxonotic-data.pk3dir.git

Make g_pickup_weapons_anyway totally incompatible with g_weapon_stay. It only causes to show the pickup effect repeatedly in g_weapon_stay 2 and 3.
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b502cac33..6c460b727 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -389,8 +389,9 @@ float Item_GiveTo(entity item, entity player)
 			}
 		}
 
+		print("^xf80 ------------------------\n");
 		if (item.flags & FL_WEAPON)
-		if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway && !(g_weapon_stay == 3 && !e.spawnshieldtime)))
+			if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway && g_weapon_stay == 0))
 		{
 			pickedup = TRUE;
 			for(i = WEP_FIRST; i <= WEP_LAST; ++i)