summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-25 02:26:34 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-25 02:26:34 +0300
commitc9f43996f3147100627ee2c6f9da993ceb160113 (patch)
tree7577f02f4658b19e05d586f66b67a9a4f5fedb7e /src/net
parent8e19f9b9d792cf4d3d3b022fd26a258c3d3d97bf (diff)
downloadmv-c9f43996f3147100627ee2c6f9da993ceb160113.tar.gz
mv-c9f43996f3147100627ee2c6f9da993ceb160113.tar.bz2
mv-c9f43996f3147100627ee2c6f9da993ceb160113.tar.xz
mv-c9f43996f3147100627ee2c6f9da993ceb160113.zip
Improve iterators part 2.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/inventoryhandler.cpp5
-rw-r--r--src/net/tmwa/loginhandler.cpp5
-rw-r--r--src/net/tmwa/network.cpp4
3 files changed, 6 insertions, 8 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index d870eff38..f28e9b396 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -431,9 +431,8 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg)
if (!mStorage)
mStorage = new Inventory(Inventory::STORAGE, size);
- Ea::InventoryItems::const_iterator it = mInventoryItems.begin();
- Ea::InventoryItems::const_iterator it_end = mInventoryItems.end();
- for (; it != it_end; ++it)
+ for (Ea::InventoryItems::const_iterator it = mInventoryItems.begin(),
+ it_end = mInventoryItems.end(); it != it_end; ++it)
{
mStorage->setItem((*it).slot, (*it).id, (*it).quantity,
(*it).refine, (*it).color, (*it).equip);
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 242270d13..e7fcc9cc6 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -197,9 +197,8 @@ void LoginHandler::processUpdateHost2(Net::MessageIn &msg)
std::string updateHost = msg.readString(len);
splitToStringVector(loginData.updateHosts, updateHost, '|');
- StringVectIter it = loginData.updateHosts.begin();
- StringVectIter it_end = loginData.updateHosts.end();
- for (; it != it_end; ++ it)
+ for (StringVectIter it = loginData.updateHosts.begin(),
+ it_end = loginData.updateHosts.end(); it != it_end; ++ it)
{
if (!checkPath(*it))
{
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 306765ff4..956067f4a 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -218,8 +218,8 @@ void Network::unregisterHandler(MessageHandler *handler)
void Network::clearHandlers()
{
- MessageHandlerIterator i;
- for (i = mMessageHandlers.begin(); i != mMessageHandlers.end(); ++i)
+ for (MessageHandlerIterator i = mMessageHandlers.begin();
+ i != mMessageHandlers.end(); ++i)
{
if (i->second)
i->second->setNetwork(nullptr);