summaryrefslogtreecommitdiff
path: root/src/localplayer.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-12-30 15:06:46 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2006-12-30 15:06:46 +0000
commit9266a94488be76e8cb9700a1426832dfc914320c (patch)
tree5cdf83c6af0cd712c426581f6bb67cb932a5aab1 /src/localplayer.cpp
parent8b72679ea1d934f24e7864a843dd92a99e2cdb5b (diff)
downloadmana-9266a94488be76e8cb9700a1426832dfc914320c.tar.gz
mana-9266a94488be76e8cb9700a1426832dfc914320c.tar.bz2
mana-9266a94488be76e8cb9700a1426832dfc914320c.tar.xz
mana-9266a94488be76e8cb9700a1426832dfc914320c.zip
Improved precise positionning of character with mouse cursor.
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r--src/localplayer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 962a1ae4..ba7b6117 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -218,9 +218,9 @@ void LocalPlayer::setDestination(Uint16 x, Uint16 y)
{
// Fix coordinates so that the player does not seem to dig into walls.
int tx = x / 32, ty = y / 32, fx = x % 32, fy = y % 32;
- if (fx != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty)) fx = 16;
- if (fy != 16 && !mMap->getWalk(tx, ty + fy / 16 * 2 - 1)) fy = 16;
- if (fx != 16 && fy != 16 && !mMap->getWalk(tx + fx / 16 * 2 - 1, ty + fy / 16 * 2 - 1)) fx = 16;
+ if (fx != 16 && mMap->tileCollides(tx + fx / 16 * 2 - 1, ty)) fx = 16;
+ if (fy != 16 && mMap->tileCollides(tx, ty + fy / 16 * 2 - 1)) fy = 16;
+ if (fx != 16 && fy != 16 && mMap->tileCollides(tx + fx / 16 * 2 - 1, ty + fy / 16 * 2 - 1)) fx = 16;
x = tx * 32 + fx;
y = ty * 32 + fy;