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/loginhandler.cpp | |
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/net/ea/loginhandler.cpp')
-rw-r--r-- | src/net/ea/loginhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index c53cdb773..ecc51bfeb 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -25,6 +25,7 @@ #include "client.h" #include "configuration.h" #include "logger.h" +#include "settings.h" #include "gui/windows/logindialog.h" @@ -85,7 +86,7 @@ void LoginHandler::chooseServer(const unsigned int server, if (charServer) { if (config.getBoolValue("usePersistentIP") || persistentIp) - charServer->hostname = client->getServerName(); + charServer->hostname = settings.serverName; else charServer->hostname = ipToString(mWorlds[server]->address); charServer->port = mWorlds[server]->port; |