Something

From 01bebf65f7e58c73fc6b89537193e34fe2c76c5e Mon Sep 17 00:00:00 2001From: Andrei Karas <akaras@inbox.ru>Date: Mon, 8 Mar 2010 17:45:40 +0200Subject: [PATCH] Fix properties bug.Fix Random crushes and valgrind memory errors.--- src/map.cpp      |    4 ++-- src/map.h        |    4 ++-- src/properties.h |    2 +- 3 files changed, 5 insertions(+), 5 deletions(-)diff --git a/src/map.cpp b/src/map.cppindex 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.hindex 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)diff --git a/src/properties.h b/src/properties.hindex 18eafc6..1320b0c 100644--- a/src/properties.h+++ b/src/properties.h@@ -45,7 +45,7 @@ class Properties          * @return the value of the given property or the given default when it          *         doesn't exist.          */-        const std::string &getProperty(const std::string &name,+        const std::string getProperty(const std::string &name,                                        const std::string &def = "") const         {             PropertyMap::const_iterator i = mProperties.find(name);-- 1.7.0