summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/map.cpp4
-rw-r--r--src/map.h12
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 23b59727..3dc5f55f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-05 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * src/map.cpp, src/map.h: Declared some methods const.
+
2007-01-03 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/resources/mapreader.cpp: Fixed memory leak on error.
diff --git a/src/map.cpp b/src/map.cpp
index 1bd8f235..ec4abc50 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -280,7 +280,7 @@ Map::setWalk(int x, int y, bool walkable)
}
bool
-Map::getWalk(int x, int y)
+Map::getWalk(int x, int y) const
{
return !tileCollides(x, y) && !occupied(x, y);
}
@@ -302,7 +302,7 @@ Map::occupied(int x, int y)
}
bool
-Map::tileCollides(int x, int y)
+Map::tileCollides(int x, int y) const
{
return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable);
}
diff --git a/src/map.h b/src/map.h
index 15b9b0dc..6d366cb3 100644
--- a/src/map.h
+++ b/src/map.h
@@ -136,36 +136,36 @@ class Map : public Properties
/**
* Tell if a tile is walkable or not, includes checking beings.
*/
- bool getWalk(int x, int y);
+ bool getWalk(int x, int y) const;
/**
* Tell if a tile collides, not including a check on beings.
*/
- bool tileCollides(int x, int y);
+ bool tileCollides(int x, int y) const;
/**
* Returns the width of this map.
*/
int
- getWidth() { return mWidth; }
+ getWidth() const { return mWidth; }
/**
* Returns the height of this map.
*/
int
- getHeight() { return mHeight; }
+ getHeight() const { return mHeight; }
/**
* Returns the tile width of this map.
*/
int
- getTileWidth() { return mTileWidth; }
+ getTileWidth() const { return mTileWidth; }
/**
* Returns the tile height used by this map.
*/
int
- getTileHeight() { return mTileHeight; }
+ getTileHeight() const { return mTileHeight; }
/**
* Find a path from one location to the next.