summaryrefslogtreecommitdiff
path: root/src/statuseffect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/statuseffect.cpp')
-rw-r--r--src/statuseffect.cpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index e46852a23..7cd71a5d7 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -70,18 +70,16 @@ void StatusEffect::deliverMessage() const
Particle *StatusEffect::getStartParticle() const
{
- if ((particleEngine == nullptr) || mStartParticleEffect.empty())
+ if (particleEngine == nullptr || mStartParticleEffect.empty())
return nullptr;
- else
- return particleEngine->addEffect(mStartParticleEffect, 0, 0);
+ return particleEngine->addEffect(mStartParticleEffect, 0, 0);
}
Particle *StatusEffect::getParticle() const
{
- if ((particleEngine == nullptr) || mParticleEffect.empty())
+ if (particleEngine == nullptr || mParticleEffect.empty())
return nullptr;
- else
- return particleEngine->addEffect(mParticleEffect, 0, 0);
+ return particleEngine->addEffect(mParticleEffect, 0, 0);
}
AnimatedSprite *StatusEffect::getIcon() const
@@ -90,17 +88,13 @@ AnimatedSprite *StatusEffect::getIcon() const
{
return nullptr;
}
- else
- {
- return AnimatedSprite::load(pathJoin(paths.getStringValue("sprites"),
- mIcon));
- }
+ return AnimatedSprite::load(pathJoin(paths.getStringValue("sprites"),
+ mIcon));
}
std::string StatusEffect::getAction() const
{
if (mAction.empty())
return SpriteAction::INVALID;
- else
- return mAction;
+ return mAction;
}