diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-05-17 05:01:12 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-05-17 05:01:12 +0200 |
| commit | 5dc6cd75cbf3d88988871af226d2a9be79b1b2a0 (patch) | |
| tree | ceff75711ee1796faab02a918663986ff5ab8258 /src | |
| parent | e1b4184da2ece6c9e1518064ffe35b9404b3db18 (diff) | |
| parent | a6ad03efc6223a46cc8336eaf43119fb346d7195 (diff) | |
| download | Mana-5dc6cd75cbf3d88988871af226d2a9be79b1b2a0.tar.gz Mana-5dc6cd75cbf3d88988871af226d2a9be79b1b2a0.tar.bz2 Mana-5dc6cd75cbf3d88988871af226d2a9be79b1b2a0.tar.xz Mana-5dc6cd75cbf3d88988871af226d2a9be79b1b2a0.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src')
| -rw-r--r-- | src/localplayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 650de182..e9bc30f2 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -727,10 +727,10 @@ void LocalPlayer::stopAttack() { if (mTarget) { - setAction(STAND); - mLastTarget = -1; + if (mAction == ATTACK) + setAction(STAND); + setTarget(NULL); } - setTarget(NULL); mLastTarget = -1; } |