summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-11 20:05:44 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-07-11 20:05:44 +0200
commitabde0f51b3062c158fb52e9dfff23d21d3be03d1 (patch)
tree4af561ea9e8cd3f7f981cce9817cf57f3e353787 /src/game.cpp
parent93e1a2a9e5f379945a6efb24598319b605be1dfa (diff)
downloadmana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.tar.gz
mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.tar.bz2
mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.tar.xz
mana-abde0f51b3062c158fb52e9dfff23d21d3be03d1.zip
Made the different hard-coded paths and files be now taken from the
data/paths.xml configuration file. Also added default gui theme path in branding and default wallpaper path and file searched respectively in the branding and paths.xml files. Hard-coded values are still used as fallbacks. Resolves: Manasource Mantis #148. Reviewed-by: jaxad0127.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 79f21863..ec5e6b13 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -928,7 +928,8 @@ void Game::changeMap(const std::string &mapPath)
mMapName = mapPath;
- std::string fullMap = "maps/" + mapPath + ".tmx";
+ std::string fullMap = paths.getValue("maps", "maps/")
+ + mMapName + ".tmx";
ResourceManager *resman = ResourceManager::getInstance();
if (!resman->exists(fullMap))
fullMap += ".gz";