Items: shift picking up weapons into WeaponPickup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / pickup.qh

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index 9a25ebe9ad28bd5c1461f355983c3d07782b9cde..19963278873103d6f8e5386bc8a7b14b7d670ccc 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -1,5 +1,6 @@
 #ifndef PICKUP_H
 #define PICKUP_H
+#include "../inventory.qh"
 #include "../item.qh"
 CLASS(Pickup, GameItem)
 #ifndef MENUQC
@@ -21,7 +22,15 @@ CLASS(Pickup, GameItem)
     ATTRIB(Pickup, m_respawntimejitter, float(), func_null)
     float Item_GiveTo(entity item, entity player);
     METHOD(Pickup, giveTo, bool(entity this, entity item, entity player))
-    { return Item_GiveTo(item, player); }
+    {
+        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);
+        }
+        return b;
+    }
     bool ITEM_HANDLE(Pickup, entity this, entity item, entity player);
 #endif
 ENDCLASS(Pickup)