diff options
author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
---|---|---|
committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
commit | f262dbd28f08001d70416e3cc4e62273d3fee2cd (patch) | |
tree | 539cbc8b27edf696120df0ac26531640c323692f /src/statuseffect.cpp | |
parent | d68f3fa13297cf4c8d29753e48c684496852ceba (diff) | |
parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
download | mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2 mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/statuseffect.cpp')
-rw-r--r-- | src/statuseffect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 8872fd7b..7a50e794 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -39,19 +39,19 @@ StatusEffect::~StatusEffect() void StatusEffect::playSFX() { - if (mSFXEffect != "") + if (!mSFXEffect.empty()) sound.playSfx(mSFXEffect); } void StatusEffect::deliverMessage() { - if (mMessage != "") + if (!mMessage.empty()) chatWindow->chatLog(mMessage, BY_SERVER); } Particle *StatusEffect::getParticle() { - if (mParticleEffect == "") + if (mParticleEffect.empty()) return NULL; else return particleEngine->addEffect(mParticleEffect, 0, 0); @@ -59,7 +59,7 @@ Particle *StatusEffect::getParticle() AnimatedSprite *StatusEffect::getIcon() { - if (mIcon == "") + if (mIcon.empty()) return NULL; else { AnimatedSprite *sprite = AnimatedSprite::load( @@ -74,7 +74,7 @@ AnimatedSprite *StatusEffect::getIcon() SpriteAction StatusEffect::getAction() { - if (mAction == "") + if (mAction.empty()) return ACTION_INVALID; else return SpriteDef::makeSpriteAction(mAction); |