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/localplayer.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/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index b450c0ba..a02a8b1b 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -343,7 +343,7 @@ void LocalPlayer::setTarget(Being *target) return; mLastTarget = tick_time; - if ((target == NULL) || target == mTarget) + if (!target || target == mTarget) { target = NULL; mKeepAttacking = false; @@ -538,7 +538,8 @@ void LocalPlayer::attack(Being *target, bool keep) if (mEquippedWeapon) { std::string soundFile = mEquippedWeapon->getSound(EQUIP_EVENT_STRIKE); - if (soundFile != "") sound.playSfx(soundFile); + if (!soundFile.empty()) + sound.playSfx(soundFile); } else { sound.playSfx("sfx/fist-swish.ogg"); |