X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem%2Fpickup.qc;h=a3c2d779edcde089ac3d4f7e142693de8e47070b;hb=d4cd74e6670b4a67f00fbb0208b5bdff5885b46e;hp=ade99c543aeacb710cabd4b9194d5de7bd6fc753;hpb=5607e279fe7b0dc9f92e15556ed6dc33f17f549c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/items/item/pickup.qc b/qcsrc/common/items/item/pickup.qc
index ade99c543..a3c2d779e 100644
--- a/qcsrc/common/items/item/pickup.qc
+++ b/qcsrc/common/items/item/pickup.qc
@@ -1,13 +1,22 @@
 #include "pickup.qh"
+#include <common/items/inventory.qh>
 
 #ifdef SVQC
 bool ITEM_HANDLE(Pickup, entity this, entity item, entity player) {
-    bool b = this.giveTo(this, item, player);
+    return this.giveTo(this, item, player);
+}
+
+METHOD(Pickup, giveTo, bool(Pickup this, entity item, entity player))
+{
+    TC(Pickup, this);
+    bool b = Item_GiveTo(item, player);
     if (b) {
-        LOG_TRACEF("entity %i picked up %s\n", player, this.m_name);
-        player.inventory.inv_items[this.m_id]++;
-        Inventory_update(player);
+        //LOG_DEBUGF("entity %i picked up %s", player, this.m_name);
+        entity store = IS_PLAYER(player) ? PS(player) : player;
+        store.inventory.inv_items[this.m_id]++;
+        Inventory_update(store);
     }
     return b;
 }
+
 #endif