From 1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 29 May 2014 12:56:16 +0300 Subject: Move many variables from client into settings. --- src/resources/atlasmanager.cpp | 2 +- src/resources/map/map.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/resources') 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"); } -- cgit v1.2.3-60-g2f50