Items: shift picking up weapons into WeaponPickup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon.qh

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index 262a91916109c5357184d6262b434650ffb5667f..624cb83f5226a478267018bc16f5f83146843db2 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -1,5 +1,6 @@
 #ifndef WEAPON_H
 #define WEAPON_H
+#include "../items/item/pickup.qh"
 
 .int ammo_shells;
 .int ammo_nails;
@@ -97,6 +98,7 @@ CLASS(WeaponPickup, Pickup)
     ATTRIB(WeaponPickup, m_sound, Sound, SND_WEAPONPICKUP)
 #endif
 #ifdef SVQC
+    ATTRIB(WeaponPickup, m_itemflags, int, FL_WEAPON)
     float weapon_pickupevalfunc(entity player, entity item);
     ATTRIB(WeaponPickup, m_pickupevalfunc, float(entity player, entity item), weapon_pickupevalfunc)
 #endif
@@ -111,6 +113,16 @@ CLASS(WeaponPickup, Pickup)
         this.m_botvalue = w.bot_pickupbasevalue;
 #endif
     }
+#ifdef SVQC
+    METHOD(WeaponPickup, giveTo, bool(entity this, entity item, entity player))
+    {
+        bool b = Item_GiveTo(item, player);
+        if (b) {
+            LOG_TRACEF("entity %i picked up %s\n", player, this.m_name);
+        }
+        return b;
+    }
+#endif
 ENDCLASS(WeaponPickup)
 
 CLASS(OffhandWeapon, Object)