From 828daee687fc65250cf7079980f8aed0bfdf419e Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 29 Aug 2011 22:13:07 +0200 Subject: [PATCH] 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. --- qcsrc/server/t_items.qc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- 2.39.2