diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/map.cpp | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map.cpp b/src/map.cpp index 6d332d48..da3f2185 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -601,7 +601,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY, std::priority_queue<Location> openList; // Return when destination not walkable - if (!getWalk(destX, destY, walkmask)) return path; + if (!getWalk(destX, destY, walkmask)) + return path; // Reset starting tile's G cost to 0 MetaTile *startTile = getMetaTile(startX, startY); |