summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-12 13:35:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-12 13:35:32 +0300
commitdbf80cecba66c3171ccebb6c22d85c3b52637882 (patch)
tree18757d1b8237c4f5e5580fe9de5b67d4b011ac25 /src/resources
parent18ba68228c2a8bce02a7bce1569be9998570d5f2 (diff)
downloadmv-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.gz
mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.bz2
mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.xz
mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.zip
fix compilation warnings.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/beingcommon.h8
-rw-r--r--src/resources/db/colordb.cpp4
-rw-r--r--src/resources/db/monsterdb.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h
index 15bab1a34..5fb1df71b 100644
--- a/src/resources/beingcommon.h
+++ b/src/resources/beingcommon.h
@@ -30,11 +30,11 @@
class BeingInfo;
#define loadXmlDir(name, function) \
- StringVect list; \
+ StringVect listVect; \
BeingCommon::getIncludeFiles(paths.getStringValue( \
- name), list); \
- FOR_EACH (StringVectCIter, it, list) \
- function(*it);
+ name), listVect); \
+ FOR_EACH (StringVectCIter, itVect, listVect) \
+ function(*itVect);
namespace BeingCommon
{
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 06dff0d3a..e4d5b83a0 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -54,8 +54,8 @@ void ColorDB::load()
StringVect list;
BeingCommon::getIncludeFiles(paths.getStringValue(
"hairColorPatchDir"), list);
- FOR_EACH (StringVectCIter, it, list)
- loadHair(*it, colors);
+ FOR_EACH (StringVectCIter, it2, list)
+ loadHair(*it2, colors);
mColorLists["hair"] = colors;
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 1fc767a2b..9b9112f0f 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -208,7 +208,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName)
}
else if (xmlNameEqual(spriteNode, "attack"))
{
- const int id = XML::getProperty(spriteNode, "id", 0);
+ const int attackId = XML::getProperty(spriteNode, "id", 0);
const int effectId = XML::getProperty(
spriteNode, "effect-id", paths.getIntValue("effectId"));
const int hitEffectId = XML::getProperty(spriteNode,
@@ -229,7 +229,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName)
const std::string missileParticle = XML::getProperty(
spriteNode, "missile-particle", "");
- currentInfo->addAttack(id, spriteAction, skySpriteAction,
+ currentInfo->addAttack(attackId, spriteAction, skySpriteAction,
waterSpriteAction, effectId, hitEffectId,
criticalHitEffectId, missEffectId, missileParticle);
}