From 0269b1f766a4e9e8ded91505855cff58c18086e2 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Oct 2009 12:40:52 -0600
Subject: Do some more post-merge cleanup

Fixes a few more bugs
---
 src/net/ea/loginhandler.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/net/ea/loginhandler.cpp')

diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index d2e2adc0..de52bfa3 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -35,13 +35,12 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-Worlds worlds;
-
 Net::LoginHandler *loginHandler;
 
 namespace EAthena {
 extern Token netToken;
 extern ServerInfo charServer;
+extern Worlds worlds;
 
 LoginHandler::LoginHandler()
 {
@@ -212,10 +211,14 @@ void LoginHandler::disconnect()
 
 void LoginHandler::loginAccount(LoginData *loginData)
 {
-    mLoginData = loginData;
     sendLoginRegister(loginData->username, loginData->password);
 }
 
+void LoginHandler::logout()
+{
+    // TODO
+}
+
 void LoginHandler::changeEmail(const std::string &email)
 {
     // TODO
@@ -242,8 +245,6 @@ void LoginHandler::chooseServer(unsigned int server)
 
 void LoginHandler::registerAccount(LoginData *loginData)
 {
-    mLoginData = loginData;
-
     std::string username = loginData->username;
     username.append((netToken.sex == GENDER_FEMALE) ? "_F" : "_M");
 
-- 
cgit v1.2.3-70-g09d2