summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/buyingstorehandler.h2
-rw-r--r--src/net/cashshophandler.h2
-rw-r--r--src/net/charserverhandler.h2
-rw-r--r--src/net/ea/inventoryitem.h2
-rw-r--r--src/net/eathena/buyingstorehandler.cpp4
-rw-r--r--src/net/eathena/buyingstorehandler.h2
-rw-r--r--src/net/eathena/cashshophandler.cpp6
-rw-r--r--src/net/eathena/cashshophandler.h2
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/eathena/charserverhandler.h2
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
-rw-r--r--src/net/eathena/inventoryhandler.h2
-rw-r--r--src/net/eathena/markethandler.cpp6
-rw-r--r--src/net/eathena/markethandler.h2
-rw-r--r--src/net/eathena/npchandler.cpp12
-rw-r--r--src/net/eathena/npchandler.h4
-rw-r--r--src/net/eathena/playerrecv.cpp2
-rw-r--r--src/net/eathena/vendinghandler.cpp10
-rw-r--r--src/net/eathena/vendinghandler.h4
-rw-r--r--src/net/inventoryhandler.h2
-rw-r--r--src/net/ipc.cpp4
-rw-r--r--src/net/ipc.h2
-rw-r--r--src/net/markethandler.h2
-rw-r--r--src/net/npchandler.h4
-rw-r--r--src/net/serverinfo.h12
-rw-r--r--src/net/tmwa/buyingstorehandler.cpp2
-rw-r--r--src/net/tmwa/buyingstorehandler.h2
-rw-r--r--src/net/tmwa/cashshophandler.cpp2
-rw-r--r--src/net/tmwa/cashshophandler.h2
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/charserverhandler.h2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.h2
-rw-r--r--src/net/tmwa/markethandler.cpp2
-rw-r--r--src/net/tmwa/markethandler.h2
-rw-r--r--src/net/tmwa/npchandler.cpp4
-rw-r--r--src/net/tmwa/npchandler.h4
-rw-r--r--src/net/tmwa/vendinghandler.cpp4
-rw-r--r--src/net/tmwa/vendinghandler.h4
-rw-r--r--src/net/vendinghandler.h4
-rw-r--r--src/net/worldinfo.h2
41 files changed, 70 insertions, 70 deletions
diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h
index 3d2b2b0e9..1ab94de88 100644
--- a/src/net/buyingstorehandler.h
+++ b/src/net/buyingstorehandler.h
@@ -50,7 +50,7 @@ class BuyingStoreHandler notfinal
virtual void create(const std::string &name,
const int maxMoney,
const bool flag,
- const std::vector<ShopItem*> &items) const = 0;
+ const STD_VECTOR<ShopItem*> &items) const = 0;
virtual void close() const = 0;
diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h
index c34548088..68b7c3ceb 100644
--- a/src/net/cashshophandler.h
+++ b/src/net/cashshophandler.h
@@ -49,7 +49,7 @@ class CashShopHandler notfinal
const int amount) const = 0;
virtual void buyItems(const int points,
- const std::vector<ShopItem*> &items) const = 0;
+ const STD_VECTOR<ShopItem*> &items) const = 0;
virtual void close() const = 0;
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index ac07909be..7d14a3bab 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -67,7 +67,7 @@ class CharServerHandler notfinal
const int hairColor,
const unsigned char race,
const uint16_t look,
- const std::vector<int> &stats) const = 0;
+ const STD_VECTOR<int> &stats) const = 0;
virtual void deleteCharacter(Net::Character *const character,
const std::string &email) const = 0;
diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h
index cbf5d1560..daf5cd65e 100644
--- a/src/net/ea/inventoryitem.h
+++ b/src/net/ea/inventoryitem.h
@@ -118,7 +118,7 @@ class InventoryItem final
}
};
-typedef std::vector<InventoryItem> InventoryItems;
+typedef STD_VECTOR<InventoryItem> InventoryItems;
} // namespace Ea
diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp
index d342be0b8..ae2157452 100644
--- a/src/net/eathena/buyingstorehandler.cpp
+++ b/src/net/eathena/buyingstorehandler.cpp
@@ -47,7 +47,7 @@ BuyingStoreHandler::BuyingStoreHandler()
void BuyingStoreHandler::create(const std::string &name,
const int maxMoney,
const bool flag,
- const std::vector<ShopItem*> &items) const
+ const STD_VECTOR<ShopItem*> &items) const
{
if (packetVersion < 20100303)
return;
@@ -56,7 +56,7 @@ void BuyingStoreHandler::create(const std::string &name,
outMsg.writeInt32(maxMoney, "limit money");
outMsg.writeInt8(static_cast<int8_t>(flag), "flag");
outMsg.writeString(name, 80, "store name");
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
const ShopItem *const item = *it;
outMsg.writeInt16(CAST_S16(item->getId()), "item id");
diff --git a/src/net/eathena/buyingstorehandler.h b/src/net/eathena/buyingstorehandler.h
index ae060095f..61b412bd6 100644
--- a/src/net/eathena/buyingstorehandler.h
+++ b/src/net/eathena/buyingstorehandler.h
@@ -35,7 +35,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;
void close() const override final;
diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp
index 105a45141..c693cb1f0 100644
--- a/src/net/eathena/cashshophandler.cpp
+++ b/src/net/eathena/cashshophandler.cpp
@@ -58,7 +58,7 @@ void CashShopHandler::buyItem(const int points,
}
void CashShopHandler::buyItems(const int points,
- const std::vector<ShopItem*> &items) const
+ const STD_VECTOR<ShopItem*> &items) const
{
if (packetVersion < 20101124)
return;
@@ -66,7 +66,7 @@ void CashShopHandler::buyItems(const int points,
int cnt = 0;
const int pairSize = 4;
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
const ShopItem *const item = *it;
const int usedQuantity = item->getUsedQuantity();
@@ -93,7 +93,7 @@ void CashShopHandler::buyItems(const int points,
outMsg.writeInt16(CAST_S16(10 + pairSize * cnt), "len");
outMsg.writeInt32(points, "points");
outMsg.writeInt16(CAST_S16(cnt), "count");
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
ShopItem *const item = *it;
const int usedQuantity = item->getUsedQuantity();
diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h
index 5fe2a6517..8adfec064 100644
--- a/src/net/eathena/cashshophandler.h
+++ b/src/net/eathena/cashshophandler.h
@@ -38,7 +38,7 @@ class CashShopHandler final : public Net::CashShopHandler
const int amount) const override final;
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;
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index a184abd07..f9cd6729d 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -76,7 +76,7 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot,
const int hairstyle, const int hairColor,
const unsigned char race,
const uint16_t look,
- const std::vector<int> &stats A_UNUSED)
+ const STD_VECTOR<int> &stats A_UNUSED)
const
{
createOutPacket(CMSG_CHAR_CREATE);
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 342dcae59..20b467120 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/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 renameCharacter(const BeingId id,
const std::string &newName) const override final;
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 74b0777e0..ed9296a8b 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -558,13 +558,13 @@ void InventoryHandler::identifyItem(const Item *const item) const
"item index");
}
-void InventoryHandler::mergeItemsAck(const std::vector<Item*> &items) const
+void InventoryHandler::mergeItemsAck(const STD_VECTOR<Item*> &items) const
{
createOutPacket(CMSG_MERGE_ITEM_ACK);
const size_t sz = items.size();
outMsg.writeInt16(CAST_S16(sz * 2 + 4),
"len");
- FOR_EACH (std::vector<Item*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<Item*>::const_iterator, it, items)
{
outMsg.writeInt16(CAST_S16((*it)->getInvIndex() + 2),
"item index");
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index c954b0ef8..3a804fb3d 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -74,7 +74,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/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp
index bcba57e81..98b8b5d9f 100644
--- a/src/net/eathena/markethandler.cpp
+++ b/src/net/eathena/markethandler.cpp
@@ -75,14 +75,14 @@ void MarketHandler::buyItem(const int itemId,
}
}
-void MarketHandler::buyItems(const std::vector<ShopItem*> &items) const
+void MarketHandler::buyItems(const STD_VECTOR<ShopItem*> &items) const
{
if (packetVersion < 20131218)
return;
int cnt = 0;
const int pairSize = 6;
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
const ShopItem *const item = *it;
const int usedQuantity = item->getUsedQuantity();
@@ -107,7 +107,7 @@ void MarketHandler::buyItems(const std::vector<ShopItem*> &items) const
createOutPacket(CMSG_NPC_MARKET_BUY);
outMsg.writeInt16(CAST_S16(4 + pairSize * cnt), "len");
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
ShopItem *const item = *it;
const int usedQuantity = item->getUsedQuantity();
diff --git a/src/net/eathena/markethandler.h b/src/net/eathena/markethandler.h
index f68eb596d..8fe2c4bfb 100644
--- a/src/net/eathena/markethandler.h
+++ b/src/net/eathena/markethandler.h
@@ -40,7 +40,7 @@ class MarketHandler final : public Net::MarketHandler
const ItemColor color,
const int amount) const override final;
- void buyItems(const std::vector<ShopItem*> &items) const
+ void buyItems(const STD_VECTOR<ShopItem*> &items) const
override final;
};
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();
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index a2962eea0..f1f259718 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/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
+ void buyItems(STD_VECTOR<ShopItem*> &items) const
override final;
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;
void completeProgressBar() const override final;
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index c575e2615..a630bf9b7 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -395,7 +395,7 @@ void PlayerRecv::processOnlineList(Net::MessageIn &msg)
BLOCK_START("PlayerRecv::processOnlineList")
const int size = msg.readInt16("len") - 4;
- std::vector<OnlinePlayer*> arr;
+ STD_VECTOR<OnlinePlayer*> arr;
if (size == 0)
{
diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp
index 728e8fb7e..c5791cfd5 100644
--- a/src/net/eathena/vendinghandler.cpp
+++ b/src/net/eathena/vendinghandler.cpp
@@ -74,12 +74,12 @@ void VendingHandler::buy(const Being *const being,
}
void VendingHandler::buyItems(const Being *const being,
- const std::vector<ShopItem*> &items) const
+ const STD_VECTOR<ShopItem*> &items) const
{
int cnt = 0;
const int pairSize = 4;
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
ShopItem *const item = *it;
const int usedQuantity = item->getUsedQuantity();
@@ -94,7 +94,7 @@ void VendingHandler::buyItems(const Being *const being,
createOutPacket(CMSG_VENDING_BUY);
outMsg.writeInt16(CAST_S16(4 + 4 + pairSize * cnt), "len");
outMsg.writeBeingId(being->getId(), "account id");
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
ShopItem *const item = *it;
const int usedQuantity = item->getUsedQuantity();
@@ -126,13 +126,13 @@ void VendingHandler::buy2(const Being *const being,
void VendingHandler::createShop(const std::string &name,
const bool flag,
- const std::vector<ShopItem*> &items) const
+ const STD_VECTOR<ShopItem*> &items) const
{
createOutPacket(CMSG_VENDING_CREATE_SHOP);
outMsg.writeInt16(CAST_S16(85 + items.size() * 8), "len");
outMsg.writeString(name, 80, "shop name");
outMsg.writeInt8(CAST_S8(flag ? 1 : 0), "flag");
- FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ FOR_EACH (STD_VECTOR<ShopItem*>::const_iterator, it, items)
{
const ShopItem *const item = *it;
outMsg.writeInt16(CAST_S16(
diff --git a/src/net/eathena/vendinghandler.h b/src/net/eathena/vendinghandler.h
index e8beae27d..d8d3948f6 100644
--- a/src/net/eathena/vendinghandler.h
+++ b/src/net/eathena/vendinghandler.h
@@ -46,12 +46,12 @@ class VendingHandler final : public Net::VendingHandler
const int amount) const override final;
void buyItems(const Being *const being,
- const std::vector<ShopItem*> &items) const
+ const STD_VECTOR<ShopItem*> &items) const
override final;
void createShop(const std::string &name,
const bool flag,
- const std::vector<ShopItem*> &items) const
+ const STD_VECTOR<ShopItem*> &items) const
override final;
};
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index b1b7591f2..a93837939 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -99,7 +99,7 @@ class InventoryHandler notfinal
virtual void identifyItem(const Item *const item) const = 0;
- virtual void mergeItemsAck(const std::vector<Item*> &items) const = 0;
+ virtual void mergeItemsAck(const STD_VECTOR<Item*> &items) const = 0;
virtual void mergetItemsCancel() const = 0;
};
diff --git a/src/net/ipc.cpp b/src/net/ipc.cpp
index d7ffa1ae9..14dd27504 100644
--- a/src/net/ipc.cpp
+++ b/src/net/ipc.cpp
@@ -198,7 +198,7 @@ void IPC::flush()
// probably need enable only commands in tool
if (chatWindow != nullptr)
{
- FOR_EACH (std::vector<std::string>::const_iterator, it,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator, it,
mDelayedCommands)
{
chatWindow->chatInput(*it);
@@ -206,7 +206,7 @@ void IPC::flush()
}
else
{
- FOR_EACH (std::vector<std::string>::const_iterator, it,
+ FOR_EACH (STD_VECTOR<std::string>::const_iterator, it,
mDelayedCommands)
{
std::string msg = *it;
diff --git a/src/net/ipc.h b/src/net/ipc.h
index 0d45e781f..a858e924a 100644
--- a/src/net/ipc.h
+++ b/src/net/ipc.h
@@ -66,7 +66,7 @@ class IPC final
unsigned int mNumReqs;
TcpNet::Socket mSocket;
- std::vector<std::string> mDelayedCommands;
+ STD_VECTOR<std::string> mDelayedCommands;
SDL_Thread *mThread;
SDL_mutex *mMutex;
unsigned short mPort;
diff --git a/src/net/markethandler.h b/src/net/markethandler.h
index 73040102f..f4b43cccd 100644
--- a/src/net/markethandler.h
+++ b/src/net/markethandler.h
@@ -52,7 +52,7 @@ class MarketHandler notfinal
const ItemColor color,
const int amount) const = 0;
- virtual void buyItems(const std::vector<ShopItem*> &items) const = 0;
+ virtual void buyItems(const STD_VECTOR<ShopItem*> &items) const = 0;
};
} // namespace Net
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index d332fba95..1e41c1144 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -85,13 +85,13 @@ class NpcHandler notfinal
const ItemColor color,
const int amount) const = 0;
- virtual void buyItems(std::vector<ShopItem*> &items) const = 0;
+ virtual void buyItems(STD_VECTOR<ShopItem*> &items) const = 0;
virtual void sellItem(const BeingId beingId,
const int itemId,
const int amount) const = 0;
- virtual void sellItems(std::vector<ShopItem*> &items) const = 0;
+ virtual void sellItems(STD_VECTOR<ShopItem*> &items) const = 0;
virtual void completeProgressBar() const = 0;
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 2deccb04f..f5da554ee 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -49,11 +49,11 @@ class ServerInfo final
std::string supportUrl;
std::string serverUrl;
std::string defaultHostName;
- std::vector<std::string> updateMirrors;
- std::vector<HostsGroup> updateHosts;
- std::vector<ServerUrlInfo> freeSources;
- std::vector<ServerUrlInfo> nonFreeSources;
- std::vector<ServerUrlInfo> docs;
+ STD_VECTOR<std::string> updateMirrors;
+ STD_VECTOR<HostsGroup> updateHosts;
+ STD_VECTOR<ServerUrlInfo> freeSources;
+ STD_VECTOR<ServerUrlInfo> nonFreeSources;
+ STD_VECTOR<ServerUrlInfo> docs;
uint16_t port;
VersionString version;
int packetVersion;
@@ -221,6 +221,6 @@ class ServerInfo final
}
};
-typedef std::vector<ServerInfo> ServerInfos;
+typedef STD_VECTOR<ServerInfo> ServerInfos;
#endif // NET_SERVERINFO_H
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;
};
diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h
index 3caeaf2b3..b5653163b 100644
--- a/src/net/vendinghandler.h
+++ b/src/net/vendinghandler.h
@@ -53,7 +53,7 @@ class VendingHandler notfinal
const int amount) const = 0;
virtual void buyItems(const Being *const being,
- const std::vector<ShopItem*> &items) const = 0;
+ const STD_VECTOR<ShopItem*> &items) const = 0;
virtual void buy2(const Being *const being,
const int vendId,
@@ -62,7 +62,7 @@ class VendingHandler notfinal
virtual void createShop(const std::string &name,
const bool flag,
- const std::vector<ShopItem*> &items) const = 0;
+ const STD_VECTOR<ShopItem*> &items) const = 0;
};
} // namespace Net
diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h
index fbbb30bfa..8ba2615e7 100644
--- a/src/net/worldinfo.h
+++ b/src/net/worldinfo.h
@@ -55,6 +55,6 @@ struct WorldInfo final
std::string updateHost;
};
-typedef std::vector<WorldInfo*> Worlds;
+typedef STD_VECTOR<WorldInfo*> Worlds;
#endif // NET_WORLDINFO_H