summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-23 02:46:01 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-23 02:48:43 +0300
commita69a87c5a81ddbf25a25c5549259da550d207bda (patch)
tree59f1a919b327912395ab84bab1684118bf0379be /src/net
parente646f2fae3f323b7faa26aa9540524d1765211ee (diff)
downloadManaVerse-a69a87c5a81ddbf25a25c5549259da550d207bda.tar.gz
ManaVerse-a69a87c5a81ddbf25a25c5549259da550d207bda.tar.bz2
ManaVerse-a69a87c5a81ddbf25a25c5549259da550d207bda.tar.xz
ManaVerse-a69a87c5a81ddbf25a25c5549259da550d207bda.zip
Improve a bit iterators again.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/manaserv/attributes.cpp15
-rw-r--r--src/net/manaserv/charhandler.cpp6
2 files changed, 12 insertions, 9 deletions
diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp
index 47eb5b253..a03e510fb 100644
--- a/src/net/manaserv/attributes.cpp
+++ b/src/net/manaserv/attributes.cpp
@@ -92,8 +92,8 @@ namespace Attributes
{
// Fill up the modifiable attribute label list.
attributeLabels.clear();
- AttributeMap::const_iterator it, it_end;
- for (it = attributes.begin(), it_end = attributes.end();
+ for (AttributeMap::const_iterator it = attributes.begin(),
+ it_end = attributes.end();
it != it_end; ++it)
{
if (it->second.modifiable && (it->second.scope == "character"
@@ -383,10 +383,11 @@ namespace Attributes
{
std::vector<ItemDB::Stat> dbStats;
- TagMap::const_iterator it, it_end;
- for (it = tags.begin(), it_end = tags.end(); it != it_end; ++it)
+ for (TagMap::const_iterator it = tags.begin(), it_end = tags.end();
+ it != it_end; ++it)
+ {
dbStats.push_back(ItemDB::Stat(it->first, it->second));
-
+ }
ItemDB::setStatsList(dbStats);
}
@@ -395,8 +396,8 @@ namespace Attributes
if (!statusWindow)
return;
- AttributeMap::const_iterator it, it_end;
- for (it = attributes.begin(), it_end = attributes.end();
+ for (AttributeMap::const_iterator it = attributes.begin(),
+ it_end = attributes.end();
it != it_end; ++it)
{
if (it->second.playerInfoId == -1
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index f1af32354..7878e5d88 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -323,9 +323,11 @@ void CharHandler::newCharacter(const std::string &name,
msg.writeInt8(gender);
msg.writeInt8(slot);
- std::vector<int>::const_iterator it, it_end;
- for (it = stats.begin(), it_end = stats.end(); it != it_end; ++it)
+ for (std::vector<int>::const_iterator it = stats.begin(),
+ it_end = stats.end(); it != it_end; ++it)
+ {
msg.writeInt16((*it));
+ }
accountServerConnection->send(msg);
}