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/tmwa | |
parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
download | manaplus-311c175f3184103950c72bc5c775174597430b83.tar.gz manaplus-311c175f3184103950c72bc5c775174597430b83.tar.bz2 manaplus-311c175f3184103950c72bc5c775174597430b83.tar.xz manaplus-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/tmwa')
-rw-r--r-- | src/net/tmwa/buyingstorehandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/buyingstorehandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/cashshophandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/cashshophandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/charserverhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/inventoryhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/markethandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/markethandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/npchandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/npchandler.h | 4 | ||||
-rw-r--r-- | src/net/tmwa/vendinghandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/vendinghandler.h | 4 |
14 files changed, 18 insertions, 18 deletions
diff --git a/src/net/tmwa/buyingstorehandler.cpp b/src/net/tmwa/buyingstorehandler.cpp index 53fe39fa7..9ea2a9822 100644 --- a/src/net/tmwa/buyingstorehandler.cpp +++ b/src/net/tmwa/buyingstorehandler.cpp @@ -33,7 +33,7 @@ BuyingStoreHandler::BuyingStoreHandler() void BuyingStoreHandler::create(const std::string &name A_UNUSED, const int maxMoney A_UNUSED, const bool flag A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h index 2292505d0..5a9ce21cc 100644 --- a/src/net/tmwa/buyingstorehandler.h +++ b/src/net/tmwa/buyingstorehandler.h @@ -36,7 +36,7 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler void create(const std::string &name, const int maxMoney, const bool flag, - const std::vector<ShopItem*> &items) const override final + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void close() const override final A_CONST; diff --git a/src/net/tmwa/cashshophandler.cpp b/src/net/tmwa/cashshophandler.cpp index 0c2315560..81a8e2871 100644 --- a/src/net/tmwa/cashshophandler.cpp +++ b/src/net/tmwa/cashshophandler.cpp @@ -39,7 +39,7 @@ void CashShopHandler::buyItem(const int points A_UNUSED, } void CashShopHandler::buyItems(const int points A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h index 6b43cdce6..328758960 100644 --- a/src/net/tmwa/cashshophandler.h +++ b/src/net/tmwa/cashshophandler.h @@ -39,7 +39,7 @@ class CashShopHandler final : public Net::CashShopHandler const int amount) const override final A_CONST; void buyItems(const int points, - const std::vector<ShopItem*> &items) const override final + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void close() const override final A_CONST; diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 200d09703..4d5ae293b 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -71,7 +71,7 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot, const int hairColor, const unsigned char race A_UNUSED, const uint16_t look A_UNUSED, - const std::vector<int> &stats) const + const STD_VECTOR<int> &stats) const { createOutPacket(CMSG_CHAR_CREATE); outMsg.writeString(name, 24, "name"); diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 98c9e2383..43050b365 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -48,7 +48,7 @@ class CharServerHandler final : public Ea::CharServerHandler const int hairColor, const unsigned char race, const uint16_t look, - const std::vector<int> &stats) const override final; + const STD_VECTOR<int> &stats) const override final; void deleteCharacter(Net::Character *const character, const std::string &email) const override final; diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index cf4c2f269..8328f159a 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -171,7 +171,7 @@ void InventoryHandler::identifyItem(const Item *const item A_UNUSED) const { } -void InventoryHandler::mergeItemsAck(const std::vector<Item*> &items A_UNUSED) +void InventoryHandler::mergeItemsAck(const STD_VECTOR<Item*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 2abab1d7d..302c52ca0 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -71,7 +71,7 @@ class InventoryHandler final : public Ea::InventoryHandler void identifyItem(const Item *const item) const override final; - void mergeItemsAck(const std::vector<Item*> &items) const + void mergeItemsAck(const STD_VECTOR<Item*> &items) const override final; void mergetItemsCancel() const override final; diff --git a/src/net/tmwa/markethandler.cpp b/src/net/tmwa/markethandler.cpp index 7f58df4bc..e5e64d9a1 100644 --- a/src/net/tmwa/markethandler.cpp +++ b/src/net/tmwa/markethandler.cpp @@ -42,7 +42,7 @@ void MarketHandler::buyItem(const int itemId A_UNUSED, { } -void MarketHandler::buyItems(const std::vector<ShopItem*> &items A_UNUSED) +void MarketHandler::buyItems(const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h index 5a75a1639..fe0f97006 100644 --- a/src/net/tmwa/markethandler.h +++ b/src/net/tmwa/markethandler.h @@ -39,7 +39,7 @@ class MarketHandler final : public Net::MarketHandler const ItemColor color, const int amount) const override final A_CONST; - void buyItems(const std::vector<ShopItem*> &items) const override final + void buyItems(const STD_VECTOR<ShopItem*> &items) const override final A_CONST; }; diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index e58ca4d69..9478282ea 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -140,7 +140,7 @@ void NpcHandler::buyItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(itemId), "item id"); } -void NpcHandler::buyItems(std::vector<ShopItem*> &items A_UNUSED) const +void NpcHandler::buyItems(STD_VECTOR<ShopItem*> &items A_UNUSED) const { } @@ -155,7 +155,7 @@ void NpcHandler::sellItem(const BeingId beingId A_UNUSED, outMsg.writeInt16(CAST_S16(amount), "amount"); } -void NpcHandler::sellItems(std::vector<ShopItem*> &items A_UNUSED) const +void NpcHandler::sellItems(STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 714bcbd65..5f413012f 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -61,14 +61,14 @@ class NpcHandler final : public Ea::NpcHandler const ItemColor color, const int amount) const override final; - void buyItems(std::vector<ShopItem*> &items) const override final + void buyItems(STD_VECTOR<ShopItem*> &items) const override final A_CONST; void sellItem(const BeingId beingId, const int itemId, const int amount) const override final; - void sellItems(std::vector<ShopItem*> &items) const override final + void sellItems(STD_VECTOR<ShopItem*> &items) const override final A_CONST; void completeProgressBar() const override final A_CONST; diff --git a/src/net/tmwa/vendinghandler.cpp b/src/net/tmwa/vendinghandler.cpp index 6742b762c..726dda217 100644 --- a/src/net/tmwa/vendinghandler.cpp +++ b/src/net/tmwa/vendinghandler.cpp @@ -45,7 +45,7 @@ void VendingHandler::buy(const Being *const being A_UNUSED, } void VendingHandler::buyItems(const Being *const being A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } @@ -59,7 +59,7 @@ void VendingHandler::buy2(const Being *const being A_UNUSED, void VendingHandler::createShop(const std::string &name A_UNUSED, const bool flag A_UNUSED, - const std::vector<ShopItem*> &items A_UNUSED) + const STD_VECTOR<ShopItem*> &items A_UNUSED) const { } diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h index 826555c75..8091e0c7e 100644 --- a/src/net/tmwa/vendinghandler.h +++ b/src/net/tmwa/vendinghandler.h @@ -42,7 +42,7 @@ class VendingHandler final : public Net::VendingHandler const int amount) const override final A_CONST; void buyItems(const Being *const being, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; void buy2(const Being *const being, @@ -52,7 +52,7 @@ class VendingHandler final : public Net::VendingHandler void createShop(const std::string &name, const bool flag, - const std::vector<ShopItem*> &items) const + const STD_VECTOR<ShopItem*> &items) const override final A_CONST; }; |