diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map.cpp | 8 | ||||
| -rw-r--r-- | src/map.h | 5 |
2 files changed, 7 insertions, 6 deletions
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) @@ -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; |