diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-02-21 16:58:09 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-02-21 16:58:09 +0100 |
| commit | ea9eccae8596d440c372b0d9709d4def4b46e648 (patch) | |
| tree | f240e8bd8e6ff0857b215d46c130e8859e481270 /src/server/game/Entities | |
| parent | d2396fb897a4a2f21a4b43f8c37f3a87c4285f2c (diff) | |
Core/Spells: Restored totem category check
Revert "Core/Totems: In cata totem items are no longer needed"
This reverts commit 45e0cae7beedd84a6e71cf99d356e836476c1e4a
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Item/ItemTemplate.h | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h index abba96cf6dc..0824b0b3c29 100644 --- a/src/server/game/Entities/Item/ItemTemplate.h +++ b/src/server/game/Entities/Item/ItemTemplate.h @@ -631,6 +631,7 @@ struct ItemTemplate uint32 GetArea() const { return ExtendedData->Area; } uint32 GetMap() const { return ExtendedData->Map; } uint32 GetBagFamily() const { return ExtendedData->BagFamily; } + uint32 GetTotemCategory() const { return ExtendedData->TotemCategory; } SocketColor GetSocketColor(uint32 index) const { ASSERT(index < MAX_ITEM_PROTO_SOCKETS); return SocketColor(ExtendedData->SocketColor[index]); } uint32 GetSocketBonus() const { return ExtendedData->SocketBonus; } uint32 GetGemProperties() const { return ExtendedData->GemProperties; } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c23e5311c9c..e5e95945c1c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -10211,6 +10211,34 @@ InventoryResult Player::CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& des return CanStoreItem(bag, slot, dest, pItem->GetEntry(), count, pItem, swap, NULL); } +bool Player::HasItemTotemCategory(uint32 TotemCategory) const +{ + Item* item; + for (uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; ++i) + { + item = GetUseableItemByPos(INVENTORY_SLOT_BAG_0, i); + if (item && IsTotemCategoryCompatibleWith(item->GetTemplate()->GetTotemCategory(), TotemCategory)) + return true; + } + + Bag* bag; + for (uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) + { + bag = GetBagByPos(i); + if (bag) + { + for (uint32 j = 0; j < bag->GetBagSize(); ++j) + { + item = GetUseableItemByPos(i, j); + if (item && IsTotemCategoryCompatibleWith(item->GetTemplate()->GetTotemCategory(), TotemCategory)) + return true; + } + } + } + + return false; +} + InventoryResult Player::CanStoreItem_InSpecificSlot(uint8 bag, uint8 slot, ItemPosCountVec &dest, ItemTemplate const* pProto, uint32& count, bool swap, Item* pSrcItem) const { Item* pItem2 = GetItemByPos(bag, slot); |
