summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-01 19:31:19 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-05-01 19:31:19 +0000
commit92aeffcfd4c0771988466262b910e04948f784bc (patch)
tree9f0d99818bc1b629e74b01d47620fcacb5e4728a /src
parentf61fc8ef256f43d1ada47fb5851f8954fea4cdea (diff)
downloadmana-client-92aeffcfd4c0771988466262b910e04948f784bc.tar.gz
mana-client-92aeffcfd4c0771988466262b910e04948f784bc.tar.bz2
mana-client-92aeffcfd4c0771988466262b910e04948f784bc.tar.xz
mana-client-92aeffcfd4c0771988466262b910e04948f784bc.zip
Fix for colliding with portals.
Diffstat (limited to 'src')
-rw-r--r--src/map.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map.cpp b/src/map.cpp
index c27a29d6..17e9fd02 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -227,7 +227,8 @@ bool Map::getWalk(int x, int y)
std::list<Being*>::iterator i = beings.begin();
while (i != beings.end()) {
Being *being = (*i);
- if (being->x == x && being->y == y) {
+ // Collision when non-portal being is found at this location
+ if (being->x == x && being->y == y && being->job != 45) {
return false;
}
i++;