summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-29 12:56:16 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-29 12:56:16 +0300
commit1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f (patch)
tree3eea380919dae735fdbeacff314edf1ad06d26ab /src/game.cpp
parent0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5 (diff)
downloadmv-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.gz
mv-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.bz2
mv-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.xz
mv-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.zip
Move many variables from client into settings.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e12ff98a7..2e6e9ddd3 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -36,6 +36,7 @@
#include "guildmanager.h"
#include "itemshortcut.h"
#include "soundmanager.h"
+#include "settings.h"
#include "spellshortcut.h"
#include "touchmanager.h"
@@ -494,7 +495,7 @@ void Game::addWatermark()
return;
mainGraphics->setColorAll(theme->getColor(Theme::TEXT, 255),
theme->getColor(Theme::TEXT_OUTLINE, 255));
- boldFont->drawString(mainGraphics, client->getServerName(), 100, 50);
+ boldFont->drawString(mainGraphics, settings.serverName, 100, 50);
}
bool Game::createScreenshot()
@@ -527,7 +528,7 @@ bool Game::createScreenshot()
bool Game::saveScreenshot(SDL_Surface *const screenshot)
{
- std::string screenshotDirectory = client->getScreenshotDirectory();
+ std::string screenshotDirectory = settings.screenshotDir;
if (mkdir_r(screenshotDirectory.c_str()) != 0)
{
logger->log("Directory %s doesn't exist and can't be created! "
@@ -548,7 +549,7 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot)
struct tm *const timeinfo = localtime(&rawtime);
strftime(buffer, 99, "%Y-%m-%d_%H-%M-%S", timeinfo);
- const std::string serverName = client->getServerName();
+ const std::string serverName = settings.serverName;
std::string screenShortStr;
if (serverName.empty())
{