diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 9221f42623..34fc8068ab 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -38,6 +38,26 @@ #include "WorldPacket.h" #include "WorldSession.h" +Item::Item() +{ + m_objectType |= TYPEMASK_ITEM; + m_objectTypeId = TYPEID_ITEM; + + m_valuesCount = ITEM_END; + m_slot = 0; + uState = ITEM_NEW; + uQueuePos = -1; + m_container = nullptr; + m_lootGenerated = false; + mb_in_trade = false; + + m_refundRecipient = 0; + m_paidMoney = 0; + m_paidExtendedCost = 0; +} + +Item::~Item() = default; + void AddItemsSetItem(Player* player, Item* item) { ItemTemplate const* proto = item->GetTemplate(); @@ -248,24 +268,6 @@ bool ItemCanGoIntoBag(ItemTemplate const* pProto, ItemTemplate const* pBagProto) return false; } -Item::Item() -{ - m_objectType |= TYPEMASK_ITEM; - m_objectTypeId = TYPEID_ITEM; - - m_valuesCount = ITEM_END; - m_slot = 0; - uState = ITEM_NEW; - uQueuePos = -1; - m_container = nullptr; - m_lootGenerated = false; - mb_in_trade = false; - - m_refundRecipient = 0; - m_paidMoney = 0; - m_paidExtendedCost = 0; -} - bool Item::Create(ObjectGuid::LowType guidlow, uint32 itemId, Player const* owner) { Object::_Create(guidlow, 0, HighGuid::Item); diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index 6c627365e0..5025a44f8c 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -64,11 +64,12 @@ class TC_GAME_API Item : public Object friend void RemoveItemFromUpdateQueueOf(Item* item, Player* player); public: + Item(); + ~Item(); + static Item* CreateItem(uint32 itemEntry, uint32 count, Player const* player = nullptr); Item* CloneItem(uint32 count, Player const* player = nullptr) const; - Item(); - virtual bool Create(ObjectGuid::LowType guidlow, uint32 itemId, Player const* owner); ItemTemplate const* GetTemplate() const;