summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-20 13:24:20 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-09-20 13:24:20 +0000
commita84133850af6d348c0c4e252b26618148702153b (patch)
treef4b8d7c9bbdeecd9c1976bdc3d3806909a25cd28 /src/map.h
parent1afcf2608c0a466d2df21faea1530955cc8061fc (diff)
downloadmana-client-a84133850af6d348c0c4e252b26618148702153b.tar.gz
mana-client-a84133850af6d348c0c4e252b26618148702153b.tar.bz2
mana-client-a84133850af6d348c0c4e252b26618148702153b.tar.xz
mana-client-a84133850af6d348c0c4e252b26618148702153b.zip
Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style
to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map.h b/src/map.h
index 3ccbe7ae..17772847 100644
--- a/src/map.h
+++ b/src/map.h
@@ -137,36 +137,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.
@@ -214,12 +214,12 @@ class Map : public Properties
/**
* Tells whether a tile is occupied by a being.
*/
- bool occupied(int x, int y);
+ bool occupied(int x, int y) const;
/**
* Tells whether the given coordinates fall within the map boundaries.
*/
- bool contains(int x, int y);
+ bool contains(int x, int y) const;
int mWidth, mHeight;
int mTileWidth, mTileHeight;