From 4507f3ef92419a25351cfbcef49ed4a87b5a579c Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 6 Mar 2011 23:26:38 +0100 Subject: [PATCH] Fix visual bug when g_weapon_stay 3 and g_pickup_weapons_anyway 1: staying over a weapon spawn point the pickup effect gets shown repeatedly --- qcsrc/server/t_items.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index ce2813de5..5a591e035 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -395,7 +395,7 @@ float Item_GiveTo(entity item, entity player) } if (item.flags & FL_WEAPON) - if ((it = item.weapons - (item.weapons & player.weapons)) || g_pickup_weapons_anyway) + if ((it = item.weapons - (item.weapons & player.weapons)) || (g_pickup_weapons_anyway && !(g_weapon_stay == 3 && !e.spawnshieldtime))) { pickedup = TRUE; for(i = WEP_FIRST; i <= WEP_LAST; ++i) -- 2.39.2