diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
| commit | e8bea8a6edf69e824a922adeb5e697111ceabe90 (patch) | |
| tree | db1937956bc585b300f2a2c8312af4ad5bf924de /src/gui/minimap.cpp | |
| parent | 593fd2b831304c8e421589aab0fb158e4b7e9c35 (diff) | |
| parent | 0b15a3ad32838134384524ce4af95d65b0b4e5da (diff) | |
| download | Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.gz Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.bz2 Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.xz Mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.zip | |
Merge remote branch '1.0/1.0'
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
Diffstat (limited to 'src/gui/minimap.cpp')
| -rw-r--r-- | src/gui/minimap.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index e973fa54..1d01f48c 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -97,15 +97,13 @@ void Minimap::setMap(Map *map) if (map) { std::string tempname = - "graphics/minimaps/"+(*map->getFilename())+".png"; + "graphics/minimaps/" + map->getFilename() + ".png"; ResourceManager *resman = ResourceManager::getInstance(); minimapName = map->getProperty("minimap"); if (minimapName.empty() && resman->exists(tempname)) - { minimapName = tempname; - } mMapImage = resman->getImage(minimapName); } |