From: terencehill Date: Sun, 6 Mar 2011 22:26:38 +0000 (+0100) Subject: Fix visual bug when g_weapon_stay 3 and g_pickup_weapons_anyway 1: staying over a... X-Git-Tag: xonotic-v0.5.0~309^2~11^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4507f3ef92419a25351cfbcef49ed4a87b5a579c;p=xonotic%2Fxonotic-data.pk3dir.git 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 --- 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)