From 27a4c8b4acdf5f433f42b5dce97f95f391e36cbf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 30 Apr 2013 01:08:04 +0300
Subject: rename variable in map class.

---
 src/map.cpp | 8 ++++----
 src/map.h   | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/map.cpp b/src/map.cpp
index a0fbab932..efd108185 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -140,7 +140,7 @@ Map::Map(const int width, const int height,
     mForegrounds(),
     mLastAScrollX(0.0f),
     mLastAScrollY(0.0f),
-    particleEffects(),
+    mParticleEffects(),
     mMapPortals(),
     mTileAnimations(),
     mOverlayDetail(config.getIntValue("OverlayDetail")),
@@ -1102,7 +1102,7 @@ void Map::addParticleEffect(const std::string &effectFile,
     newEffect.y = y;
     newEffect.w = w;
     newEffect.h = h;
-    particleEffects.push_back(newEffect);
+    mParticleEffects.push_back(newEffect);
 }
 
 void Map::initializeParticleEffects(Particle *const engine)
@@ -1113,8 +1113,8 @@ void Map::initializeParticleEffects(Particle *const engine)
     if (config.getBoolValue("particleeffects"))
     {
         for (std::vector<ParticleEffectData>::const_iterator
-             i = particleEffects.begin();
-             i != particleEffects.end(); ++i)
+             i = mParticleEffects.begin();
+             i != mParticleEffects.end(); ++i)
         {
             Particle *const p = engine->addEffect(i->file, i->x, i->y);
             if (p && i->w > 0 && i->h > 0)
diff --git a/src/map.h b/src/map.h
index a9c2ee5dd..7c414b766 100644
--- a/src/map.h
+++ b/src/map.h
@@ -456,7 +456,8 @@ class Map final : public Properties, public ConfigListener
          */
         unsigned *mOccupation[NB_BLOCKTYPES];
 
-        int mWidth, mHeight;
+        int mWidth;
+        int mHeight;
         int mTileWidth, mTileHeight;
         int mMaxTileHeight;
         MetaTile *mMetaTiles;
@@ -497,7 +498,7 @@ class Map final : public Properties, public ConfigListener
             int w;
             int h;
         };
-        std::vector<ParticleEffectData> particleEffects;
+        std::vector<ParticleEffectData> mParticleEffects;
 
         std::vector<MapItem*> mMapPortals;
 
-- 
cgit v1.2.3-70-g09d2