Make g_pickup_weapons_anyway totally incompatible with g_weapon_stay. It only causes...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b502cac3312d051d46c4f044516f78c1d4ff80eb..6c460b7270dcce88b48d9905d120571b31336703 100644 (file)
--- 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)