summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-25 23:04:58 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-25 23:04:58 +0200
commita36909f5c3408153c9b5f9477adde9b27d8c7482 (patch)
tree0acd7721cd2bb2b27878d20027d0510458581515 /src/map.h
parent4e18e7619e9a8c909dea3374a2a7aa39befe0c16 (diff)
downloadmana-client-a36909f5c3408153c9b5f9477adde9b27d8c7482.tar.gz
mana-client-a36909f5c3408153c9b5f9477adde9b27d8c7482.tar.bz2
mana-client-a36909f5c3408153c9b5f9477adde9b27d8c7482.tar.xz
mana-client-a36909f5c3408153c9b5f9477adde9b27d8c7482.zip
Handle map not found gracefully
Instead of shutting down, the client will now draw a gray background. This allows the player to still contact a GM in order to be helped out of the situation. It also helps me warp out of the non-existing map I accidentally warped myself onto. ;)
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map.h b/src/map.h
index ba6cf24e..0432dc34 100644
--- a/src/map.h
+++ b/src/map.h
@@ -201,7 +201,7 @@ class Map : public Properties
/**
* Finds the tile set that a tile with the given global id is part of.
*/
- Tileset* getTilesetWithGid(int gid) const;
+ Tileset *getTilesetWithGid(int gid) const;
/**
* Get tile reference.
@@ -209,7 +209,7 @@ class Map : public Properties
MetaTile *getMetaTile(int x, int y) const;
/**
- * Marks a tile as occupied
+ * Marks a tile as occupied.
*/
void blockTile(int x, int y, BlockType type);
@@ -220,12 +220,12 @@ class Map : public Properties
bool getWalk(int x, int y, char walkmask = BLOCKMASK_WALL) const;
/**
- * Returns the width of this map.
+ * Returns the width of this map in tiles.
*/
int getWidth() const { return mWidth; }
/**
- * Returns the height of this map.
+ * Returns the height of this map in tiles.
*/
int getHeight() const { return mHeight; }
@@ -239,6 +239,9 @@ class Map : public Properties
*/
int getTileHeight() const { return mTileHeight; }
+ const std::string &getMusicFile() const;
+ const std::string &getName() const;
+
/**
* Find a path from one location to the next.
*/