fix compilation warnings.

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);
             }