summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2010-03-08 17:45:40 +0200
committerBertram <yohanndotferreiraatorange.fr>2010-03-08 17:12:38 +0100
commit9951bf6c1c2e3966f92f1545b60a9e23a1f32565 (patch)
treee3f9fbcb3ff252390a1af4137ddfd8694b8c77e4 /src/map.cpp
parent71cefdb345652342a3eaf84f197586809128e6ab (diff)
downloadmana-9951bf6c1c2e3966f92f1545b60a9e23a1f32565.tar.gz
mana-9951bf6c1c2e3966f92f1545b60a9e23a1f32565.tar.bz2
mana-9951bf6c1c2e3966f92f1545b60a9e23a1f32565.tar.xz
mana-9951bf6c1c2e3966f92f1545b60a9e23a1f32565.zip
Fix properties bug.
Fix Random crushes and valgrind memory errors. Reviewed-by: thorbjorn
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp
index b1bd634b..9f0a901b 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -564,12 +564,12 @@ void Map::removeSprite(MapSprite iterator)
mSprites.erase(iterator);
}
-const std::string &Map::getMusicFile() const
+const std::string Map::getMusicFile() const
{
return getProperty("music");
}
-const std::string &Map::getName() const
+const std::string Map::getName() const
{
if (hasProperty("name"))
return getProperty("name");