From 0fc055850bc9a44e88570cd6e8f09f47d5f862d2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 8 Mar 2010 17:45:40 +0200 Subject: [PATCH] Fix properties bug. Fix Random crushes and valgrind memory errors. --- src/map.cpp | 4 ++-- src/map.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index b1bd634..9f0a901 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"); diff --git a/src/map.h b/src/map.h index 9d5fe02..7b91b6b 100644 --- a/src/map.h +++ b/src/map.h @@ -263,8 +263,8 @@ class Map : public Properties int getTileHeight() const { return mTileHeight; } - const std::string &getMusicFile() const; - const std::string &getName() const; + const std::string getMusicFile() const; + const std::string getName() const; /** * Gives the map id based on filepath (ex: 009-1) -- 1.7.0