From 703a3c4df3732e3e88559147001260f3355d42d6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Sep 2011 22:10:53 +0300
Subject: Continue fix for shadow variables/methods errors.

---
 src/map.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/map.cpp')

diff --git a/src/map.cpp b/src/map.cpp
index e5b3632b6..86d1171f0 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -114,10 +114,10 @@ void TileAnimation::update(int ticks)
     }
 }
 
-MapLayer::MapLayer(int x, int y, int width, int height, bool isFringeLayer):
+MapLayer::MapLayer(int x, int y, int width, int height, bool fringeLayer):
     mX(x), mY(y),
     mWidth(width), mHeight(height),
-    mIsFringeLayer(isFringeLayer),
+    mIsFringeLayer(fringeLayer),
     mHighlightAttackRange(config.getBoolValue("highlightAttackRange"))
 {
     const int size = mWidth * mHeight;
@@ -1592,9 +1592,9 @@ void Map::addParticleEffect(const std::string &effectFile,
     particleEffects.push_back(newEffect);
 }
 
-void Map::initializeParticleEffects(Particle *particleEngine)
+void Map::initializeParticleEffects(Particle *engine)
 {
-    if (!particleEngine)
+    if (!engine)
         return;
 
     Particle *p;
@@ -1605,7 +1605,7 @@ void Map::initializeParticleEffects(Particle *particleEngine)
              i = particleEffects.begin();
              i != particleEffects.end(); ++i)
         {
-            p = particleEngine->addEffect(i->file, i->x, i->y);
+            p = engine->addEffect(i->file, i->x, i->y);
             if (p && i->w > 0 && i->h > 0)
                 p->adjustEmitterSize(i->w, i->h);
         }
-- 
cgit v1.2.3-60-g2f50