summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-25 04:09:19 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-25 04:09:19 +0300
commit269ee1e98ef1645957276ba4160c96db307f1771 (patch)
treef810e934c7af5eb2df742933bf1566a2a8cede28 /src/map.cpp
parent9373adc5956b57f2b8bc16ba0c66ffcc031b9c2f (diff)
downloadmv-269ee1e98ef1645957276ba4160c96db307f1771.tar.gz
mv-269ee1e98ef1645957276ba4160c96db307f1771.tar.bz2
mv-269ee1e98ef1645957276ba4160c96db307f1771.tar.xz
mv-269ee1e98ef1645957276ba4160c96db307f1771.zip
Add missing checks.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 23089db4e..f79539567 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1001,6 +1001,9 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
// Path to be built up (empty by default)
Path path;
+ if (startX >= mWidth || startY >= mHeight)
+ return path;
+
// Declare open list, a list with open tiles sorted on F cost
std::priority_queue<Location> openList;
@@ -1601,6 +1604,9 @@ void SpecialLayer::addRoad(Path road)
void SpecialLayer::clean()
{
+ if (!mTiles)
+ return;
+
for (int f = 0; f < mWidth * mHeight; f ++)
{
MapItem *item = mTiles[f];