X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem%2Fpickup.qh;h=fb4bc28cd8ede336f7d6d656ca25edbdd4972e42;hb=5c9f51cd3a9f0b63733ee7b81649e81872a86765;hp=39cf78cc3016e3d3b4714bcf169c843892342f59;hpb=81062a39c99785039ceee2dcd187fed9352a08c5;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index 39cf78cc3..fb4bc28cd 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -17,15 +17,7 @@ PROPERTY(float, g_pickup_respawntimejitter_long) PROPERTY(float, g_pickup_respawntimejitter_powerup) #endif -#include #include -#include - -#ifdef GAMEQC -#include -#include -#include -#endif CLASS(Pickup, GameItem) #ifdef GAMEQC @@ -52,17 +44,7 @@ CLASS(Pickup, GameItem) ATTRIB(Pickup, m_pickupanyway, float()); ATTRIB(Pickup, m_iteminit, void(entity item)); float Item_GiveTo(entity item, entity player); - METHOD(Pickup, giveTo, bool(Pickup this, entity item, entity player)) - { - TC(Pickup, this); - bool b = Item_GiveTo(item, player); - if (b) { - LOG_DEBUGF("entity %i picked up %s", player, this.m_name); - player.inventory.inv_items[this.m_id]++; - Inventory_update(player); - } - return b; - } + METHOD(Pickup, giveTo, bool(Pickup this, entity item, entity player)); bool ITEM_HANDLE(Pickup, Pickup this, entity item, entity player); #endif ENDCLASS(Pickup)