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/net/ea/charserverhandler.cpp | |
| parent | 0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5 (diff) | |
| download | manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.gz manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.bz2 manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.xz manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.zip | |
Move many variables from client into settings.
Diffstat (limited to 'src/net/ea/charserverhandler.cpp')
| -rw-r--r-- | src/net/ea/charserverhandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 2f285269a..d7ad9fd11 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -24,6 +24,7 @@ #include "client.h" #include "configuration.h" +#include "settings.h" #include "gui/windows/charcreatedialog.h" #include "gui/windows/okdialog.h" @@ -244,10 +245,10 @@ void CharServerHandler::processCharMapInfo(Net::MessageIn &restrict msg, PlayerInfo::setCharId(msg.readInt32()); GameHandler *const gh = static_cast<GameHandler*>(Net::getGameHandler()); gh->setMap(msg.readString(16)); - if (config.getBoolValue("usePersistentIP") || client->getPersistentIp()) + if (config.getBoolValue("usePersistentIP") || settings.persistentIp) { msg.readInt32(); - server.hostname = client->getServerName(); + server.hostname = settings.serverName; } else { |