diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-29 12:56:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-29 12:56:16 +0300 |
| commit | 1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f (patch) | |
| tree | 3eea380919dae735fdbeacff314edf1ad06d26ab /src/resources | |
| parent | 0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5 (diff) | |
| download | manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.gz manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.bz2 manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.xz manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.zip | |
Move many variables from client into settings.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/atlasmanager.cpp | 2 | ||||
| -rw-r--r-- | src/resources/map/map.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index e1dd05d2d..50e8cbc80 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -78,7 +78,7 @@ AtlasResource *AtlasManager::loadTextureAtlas(const std::string &name, continue; // debug save -// ImageWriter::writePNG(surface, client->getTempDirectory() +// ImageWriter::writePNG(surface, settings.tempDir // + "/atlas" + name + toString(k) + ".png"); // k ++; diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 829c6b3cf..d18281c1a 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -27,6 +27,7 @@ #include "render/graphics.h" #include "notifications.h" #include "notifymanager.h" +#include "settings.h" #include "resources/map/mapheights.h" #include "resources/map/maplayer.h" @@ -1109,7 +1110,7 @@ void Map::saveExtraLayer() const std::string Map::getUserMapDirectory() const { - return client->getServerConfigDirectory() + + return settings.serverConfigDir + dirSeparator + getProperty("_realfilename"); } |