diff options
| author | Azazel <azazel.kon@gmail.com> | 2011-03-18 15:58:08 +0600 |
|---|---|---|
| committer | Azazel <azazel.kon@gmail.com> | 2011-03-18 15:58:08 +0600 |
| commit | e49b5b44d6588b04ba7176f2814f4515006ba5ef (patch) | |
| tree | 29cc1c0a1ece7b596d909a94ae8ce8b015af3fc1 /src/server/game/Server/Protocol | |
| parent | 90a3fee2329571863e907315fc6b5bfc7d1c96f5 (diff) | |
Core/Cleanup: remove C-style cast to (Bag*):
* add ToBag() methods for Item class;
* add GetBagByPos() method for Player class.
Diffstat (limited to 'src/server/game/Server/Protocol')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp index 61ff1fab095..454ecdeddf4 100755 --- a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp @@ -188,7 +188,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data) return; } - if (it->IsBag() && !((Bag*)it)->IsEmpty()) + if (!it->IsNotEmptyBag()) { SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); return; diff --git a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp index 716715ecb2f..770ed41badb 100755 --- a/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/ItemHandler.cpp @@ -516,7 +516,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data) } // prevent sell non empty bag by drag-and-drop at vendor's item list - if (pItem->IsBag() && !((Bag*)pItem)->IsEmpty()) + if (pItem->IsNotEmptyBag()) { _player->SendSellError(SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0); return; @@ -668,7 +668,7 @@ void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recv_data) { for (int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i) { - if (Bag *pBag = (Bag*)_player->GetItemByPos(INVENTORY_SLOT_BAG_0,i)) + if (Bag* pBag = _player->GetBagByPos(i)) { if (bagguid == pBag->GetGUID()) { diff --git a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp index 7d910b4b96c..8e62949c7fe 100755 --- a/src/server/game/Server/Protocol/Handlers/MailHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MailHandler.cpp @@ -219,7 +219,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data) return; } - if (item->IsBag() && !((Bag*)item)->IsEmpty()) + if (item->IsNotEmptyBag()) { pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_EQUIP_ERROR, EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS); return; |
