From 102a364ffc6c386fcdeb062f7b3e2a66619fb025 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 16 Dec 2011 18:13:15 +0100 Subject: [PATCH] also move this block --- qcsrc/server/t_items.qc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 0e81d82fe..9241813f0 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -305,13 +305,6 @@ float Item_GiveTo(entity item, entity player) player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot); } - if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) - { - pickedup = TRUE; - player.items |= it; - sprint (player, strcat("You got the ^2", item.netname, "\n")); - } - _switchweapon = TRUE; if (item.ammo_cells) { @@ -336,6 +329,13 @@ float Item_GiveTo(entity item, entity player) } } + if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK)) + { + pickedup = TRUE; + player.items |= it; + sprint (player, strcat("You got the ^2", item.netname, "\n")); + } + // extralife powerup if (item.max_health) { -- 2.39.2