diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2012-06-22 05:28:49 -0700 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2012-06-22 05:28:49 -0700 |
| commit | acee199e7882b4c82b2ded20b7cf429263f687d1 (patch) | |
| tree | cbc26f2d950e71733fabd5734433ecef7e264a88 /src | |
| parent | 92bcddfcbcb54a5da31b31a77927b8468b32b7ee (diff) | |
| parent | 69285b1a4d176fa4d39622212d61c79a33eb2d34 (diff) | |
Merge pull request #6895 from Xees/master
Core/Player: Modify GetItemByEntry to include Currency.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 42d342cbcf9..b1355ad2338 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -12933,6 +12933,11 @@ Item* Player::GetItemByEntry(uint32 entry) const if (pItem->GetEntry() == entry) return pItem; + for (uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i) + if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i)) + if (pItem->GetEntry() == entry) + return pItem; + for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) if (Bag* pBag = GetBagByPos(i)) for (uint32 j = 0; j < pBag->GetBagSize(); ++j) |