diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-25 23:10:29 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-25 23:10:29 +0200 |
| commit | a1dc06196ddcee0fa2b9357be86c9c8bace967e3 (patch) | |
| tree | 608c182350ca2548380709f4b5605ac9ab63deba /src/map.cpp | |
| parent | d76a9210b07cdcf97ae4f94af429b5fa3e72b239 (diff) | |
| parent | a36909f5c3408153c9b5f9477adde9b27d8c7482 (diff) | |
| download | mana-client-a1dc06196ddcee0fa2b9357be86c9c8bace967e3.tar.gz mana-client-a1dc06196ddcee0fa2b9357be86c9c8bace967e3.tar.bz2 mana-client-a1dc06196ddcee0fa2b9357be86c9c8bace967e3.tar.xz mana-client-a1dc06196ddcee0fa2b9357be86c9c8bace967e3.zip | |
Merge branch '0.0.29'
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/map.cpp b/src/map.cpp index 4d867865..f0a5eae0 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -460,6 +460,19 @@ void Map::removeSprite(SpriteIterator iterator) mSprites.erase(iterator); } +const std::string &Map::getMusicFile() const +{ + return getProperty("music"); +} + +const std::string &Map::getName() const +{ + if (hasProperty("name")) + return getProperty("name"); + + return getProperty("mapname"); +} + static int const basicCost = 100; Path Map::findPath(int startX, int startY, int destX, int destY, unsigned char walkmask, int maxCost) |