Merged 0.0 changes from revision 2825 to 2898 to trunk.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/map.h b/src/map.h
index 961326b8..15b9b0dc 100644
--- a/src/map.h
+++ b/src/map.h
@@ -129,7 +129,7 @@ class Map : public Properties
         MetaTile *getMetaTile(int x, int y);
 
         /**
-         * Set walkability flag for a tile
+         * Set walkability flag for a tile.
          */
         void setWalk(int x, int y, bool walkable);
 
@@ -199,6 +199,16 @@ class Map : public Properties
         Tileset*
         getTilesetWithGid(int gid);
 
+        /**
+         * Tells whether a tile is occupied by a being.
+         */
+        bool occupied(int x, int y);
+
+        /**
+         * Tells whether the given coordinates fall within the map boundaries.
+         */
+        bool contains(int x, int y);
+
         int mWidth, mHeight;
         int mTileWidth, mTileHeight;
         MetaTile *mMetaTiles;