summaryrefslogtreecommitdiff
path: root/src/particle.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/particle.cpp
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadMana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
Mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
Mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
Mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/particle.cpp')
-rw-r--r--src/particle.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/particle.cpp b/src/particle.cpp
index 3062de51..953e4160 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -52,24 +52,7 @@ int Particle::emitterSkip = 1;
bool Particle::enabled = true;
const float Particle::PARTICLE_SKY = 800.0f;
-Particle::Particle(Map *map):
- mAlpha(1.0f),
- mLifetimeLeft(-1),
- mLifetimePast(0),
- mFadeOut(0),
- mFadeIn(0),
- mAlive(ALIVE),
- mAutoDelete(true),
- mAllowSizeAdjust(false),
- mDeathEffectConditions(0x00),
- mGravity(0.0f),
- mRandomness(0),
- mBounce(0.0f),
- mFollow(false),
- mTarget(nullptr),
- mAcceleration(0.0f),
- mInvDieDistance(-1.0f),
- mMomentum(1.0f)
+Particle::Particle(Map *map)
{
setMap(map);
Particle::particleCount++;
@@ -238,7 +221,7 @@ bool Particle::update()
}
}
- return !(mAlive != ALIVE && mChildParticles.empty() && mAutoDelete);
+ return mAlive == ALIVE || !mChildParticles.empty() || !mAutoDelete;
}
void Particle::moveBy(const Vector &change)