Merge branch '0.0.29'

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.
          */