From 6b291b6515825f4ce0e09df5dec7ea1b619b63a7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 6 Mar 2014 00:39:58 +0300
Subject: improve a bit different code.

---
 src/client.cpp | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 5d635f522..cdee0b049 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -185,7 +185,7 @@ bool isSafeMode = false;
 int serverVersion = 0;
 unsigned int tmwServerVersion = 0;
 int start_time;
-
+unsigned int mLastHost = 0;
 int textures_count = 0;
 
 #ifdef WIN32
@@ -1323,7 +1323,7 @@ int Client::gameExec()
                         // TRANSLATORS: connection dialog header
                         _("Logging in"), STATE_SWITCH_SERVER);
                     mCurrentDialog->postInit();
-                    accountLogin(&loginData);
+                    Net::getLoginHandler()->loginOrRegister(&loginData);
                     BLOCK_END("Client::gameExec STATE_LOGIN_ATTEMPT")
                     break;
 
@@ -2340,30 +2340,6 @@ void Client::initScreenshotDir()
     logger->log("screenshotDirectory: " + mScreenshotDir);
 }
 
-void Client::accountLogin(LoginData *const data)
-{
-    if (!data)
-        return;
-
-    logger->log("Username is %s", data->username.c_str());
-
-    // Send login infos
-    if (data->registerLogin)
-        Net::getLoginHandler()->registerAccount(data);
-    else
-        Net::getLoginHandler()->loginAccount(data);
-
-    // Clear the password, avoids auto login when returning to login
-    data->password.clear();
-
-    const bool remember = data->remember;
-    if (remember)
-        serverConfig.setValue("username", data->username);
-    else
-        serverConfig.setValue("username", "");
-    serverConfig.setValue("remember", remember);
-}
-
 #ifndef ANDROID
 void Client::storeSafeParameters() const
 {
-- 
cgit v1.2.3-60-g2f50