diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
| commit | 311c175f3184103950c72bc5c775174597430b83 (patch) | |
| tree | ad022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/net/eathena/npchandler.cpp | |
| parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
| download | mv-311c175f3184103950c72bc5c775174597430b83.tar.gz mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2 mv-311c175f3184103950c72bc5c775174597430b83.tar.xz mv-311c175f3184103950c72bc5c775174597430b83.zip | |
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes.
Now it can be also mse::mstd::vector, but sadly this class not support
all required features.
Diffstat (limited to 'src/net/eathena/npchandler.cpp')
| -rw-r--r-- | src/net/eathena/npchandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 4e8d179f0..65e05e866 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -160,12 +160,12 @@ void NpcHandler::buyItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(itemId), "item id"); } -void NpcHandler::buyItems(std::vector<ShopItem*> &items) const +void NpcHandler::buyItems(STD_VECTOR<ShopItem*> &items) const { int cnt = 0; const int pairSize = 4; - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -190,7 +190,7 @@ void NpcHandler::buyItems(std::vector<ShopItem*> &items) const createOutPacket(CMSG_NPC_BUY_REQUEST); outMsg.writeInt16(CAST_S16(4 + pairSize * cnt), "len"); - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -229,12 +229,12 @@ void NpcHandler::sellItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(amount), "amount"); } -void NpcHandler::sellItems(std::vector<ShopItem*> &items) const +void NpcHandler::sellItems(STD_VECTOR<ShopItem*> &items) const { const int pairSize = 4; int cnt = 0; - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); @@ -245,7 +245,7 @@ void NpcHandler::sellItems(std::vector<ShopItem*> &items) const createOutPacket(CMSG_NPC_SELL_REQUEST); outMsg.writeInt16(CAST_S16(4 + pairSize * cnt), "len"); - FOR_EACH (std::vector<ShopItem*>::iterator, it, items) + FOR_EACH (STD_VECTOR<ShopItem*>::iterator, it, items) { ShopItem *const item = *it; const int usedQuantity = item->getUsedQuantity(); |