summaryrefslogtreecommitdiff
path: root/src/localplayer.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-06-08 15:17:58 +0200
committerPhilipp Sehmisch <crush@themanaworld.org>2009-06-08 15:17:58 +0200
commitc79d89473114756edfc426a2b93149056031fae1 (patch)
tree09b2c084e508a886546f8fc422d882fbe4386a82 /src/localplayer.cpp
parent263fc757297103935cbdaa1bb6eca14ff8e75ecd (diff)
parentb00467d5bbf775dcd60d0f2e60eded3f9289729b (diff)
downloadmana-client-c79d89473114756edfc426a2b93149056031fae1.tar.gz
mana-client-c79d89473114756edfc426a2b93149056031fae1.tar.bz2
mana-client-c79d89473114756edfc426a2b93149056031fae1.tar.xz
mana-client-c79d89473114756edfc426a2b93149056031fae1.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r--src/localplayer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 782a461a..2f8761e7 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -440,9 +440,9 @@ void LocalPlayer::walk(unsigned char dir)
int dScaler; // Distance to walk
- // Checks our path up to 2 tiles, if a blocking tile is found
+ // Checks our path up to 1 tiles, if a blocking tile is found
// We go to the last good tile, and break out of the loop
- for (dScaler = 1; dScaler <= 2; dScaler++)
+ for (dScaler = 1; dScaler <= 1; dScaler++)
{
if ( (dx || dy) &&
!mMap->getWalk( ((int) pos.x + (dx * dScaler)) / 32,