summaryrefslogtreecommitdiff
path: root/src/localplayer.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 00:39:57 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 00:40:42 +0100
commit550a02997572b5d090b436b7c05d19c1823556a9 (patch)
tree65b6bf872711d67d1ed2b7e530bd47cb88a155af /src/localplayer.cpp
parent8b6bfeb0a70d4f97cc2d20ce04fc240b65082cf1 (diff)
parent91387e410c9f9ea16c5b41bd1cc576cbd85cf835 (diff)
downloadmana-550a02997572b5d090b436b7c05d19c1823556a9.tar.gz
mana-550a02997572b5d090b436b7c05d19c1823556a9.tar.bz2
mana-550a02997572b5d090b436b7c05d19c1823556a9.tar.xz
mana-550a02997572b5d090b436b7c05d19c1823556a9.zip
Merged with 'master'
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r--src/localplayer.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 14d253c0..ffb4aac9 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -353,10 +353,7 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y)
void LocalPlayer::setWalkingDir(int dir)
{
- if (mWalkingDir != dir)
- {
- mWalkingDir = dir;
- }
+ mWalkingDir = dir;
// If we're not already walking, start walking.
if (mAction != WALK && dir
@@ -368,7 +365,7 @@ void LocalPlayer::setWalkingDir(int dir)
void LocalPlayer::stopWalking(bool sendToServer)
{
- if(mAction == WALK && mWalkingDir){
+ if (mAction == WALK && mWalkingDir) {
mWalkingDir = 0;
mLocalWalkTime = 0;
Being::setDestination(getPosition().x,getPosition().y);