diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-08 14:49:14 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-08 14:49:14 +0000 |
| commit | 61536d859c62518718d17e82e21b3a2459de3410 (patch) | |
| tree | ecf992d7334f2bd9c035a1043c22cf0225b0d6f1 /src/localplayer.cpp | |
| parent | 8f375a38ad972a1fcac7953cc0d254313c88b7c9 (diff) | |
| download | mana-61536d859c62518718d17e82e21b3a2459de3410.tar.gz mana-61536d859c62518718d17e82e21b3a2459de3410.tar.bz2 mana-61536d859c62518718d17e82e21b3a2459de3410.tar.xz mana-61536d859c62518718d17e82e21b3a2459de3410.zip | |
Reverted changes from r2225, it broke walking code as I missed the differences between tile and being collisions.
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 29a2a54b..89302ea2 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -203,7 +203,8 @@ void LocalPlayer::walk(unsigned char dir) if (dx && dy && !mMap->getWalk(x + dx, y + dy)) dx = 0; - if (dx || dy) + // Walk to where the player can actually go + if ((dx || dy) && mMap->getWalk(x + dx, y + dy)) { setDestination(x + dx, y + dy); } @@ -217,10 +218,6 @@ void LocalPlayer::walk(unsigned char dir) void LocalPlayer::setDestination(Uint16 x, Uint16 y) { - // Check if we can walk there - if (!mMap->getWalk(x, y)) - return; - char temp[3]; MessageOut outMsg(mNetwork); set_coordinates(temp, x, y, direction); |