diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-01-20 20:43:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-01-20 23:48:07 +0300 |
| commit | 2744e4fa8f39cd06bfe557a5a3881830bd11501c (patch) | |
| tree | 2ec96c6ee820cfe0e5e76480fe828501bf555a4b /src/net | |
| parent | 531433248fbad49e2b8e9d90de9855f3ea9b2257 (diff) | |
| download | mv-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.gz mv-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.bz2 mv-2744e4fa8f39cd06bfe557a5a3881830bd11501c.tar.xz mv-2744e4fa8f39cd06bfe557a5a3881830bd11501c.zip | |
Last part with FOR_EACH changes.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/eathena/loginhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/eathena/network.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/loginhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/network.cpp | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 755c6c027..eceb194f9 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -429,8 +429,7 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg) if (!mStorage) mStorage = new Inventory(Inventory::STORAGE, size); - for (Ea::InventoryItems::const_iterator it = mInventoryItems.begin(), - it_end = mInventoryItems.end(); it != it_end; ++it) + FOR_EACH (Ea::InventoryItems::const_iterator, it, mInventoryItems) { mStorage->setItem((*it).slot, (*it).id, (*it).quantity, (*it).refine, (*it).color, (*it).equip); diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 4ad3593f1..eb0d1914b 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -182,8 +182,7 @@ void LoginHandler::processUpdateHost2(Net::MessageIn &msg) std::string updateHost = msg.readString(len); splitToStringVector(loginData.updateHosts, updateHost, '|'); - for (StringVectIter it = loginData.updateHosts.begin(), - it_end = loginData.updateHosts.end(); it != it_end; ++ it) + FOR_EACH (StringVectIter, it, loginData.updateHosts) { if (!checkPath(*it)) { diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 8d0613f97..00e2fa9cf 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -146,8 +146,7 @@ void Network::unregisterHandler(MessageHandler *handler) void Network::clearHandlers() { - for (MessageHandlerIterator i = mMessageHandlers.begin(); - i != mMessageHandlers.end(); ++i) + FOR_EACH (MessageHandlerIterator, i, mMessageHandlers) { if (i->second) i->second->setNetwork(nullptr); diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 76b832586..a3a9f3345 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -219,8 +219,7 @@ void LoginHandler::processUpdateHost2(Net::MessageIn &msg) std::string updateHost = msg.readString(len); splitToStringVector(loginData.updateHosts, updateHost, '|'); - for (StringVectIter it = loginData.updateHosts.begin(), - it_end = loginData.updateHosts.end(); it != it_end; ++ it) + FOR_EACH (StringVectIter, it, loginData.updateHosts) { if (!checkPath(*it)) { diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index e256657e0..d0e0686fc 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -124,8 +124,7 @@ void Network::unregisterHandler(MessageHandler *handler) void Network::clearHandlers() { - for (MessageHandlerIterator i = mMessageHandlers.begin(); - i != mMessageHandlers.end(); ++i) + FOR_EACH (MessageHandlerIterator, i, mMessageHandlers) { if (i->second) i->second->setNetwork(nullptr); |