Do some more post-merge cleanup

Fixes a few more bugs

4 files changed, 15 insertions, 1 deletions

diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp
index 0f4b5109..7948953e 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/tmwserv/generalhandler.cpp
@@ -55,7 +55,7 @@
 
 #include <list>
 
-Net::GeneralHandler *generalHandler;
+Net::GeneralHandler *generalHandler  = NULL;
 
 Net::Connection *gameServerConnection = 0;
 Net::Connection *chatServerConnection = 0;
@@ -126,6 +126,11 @@ void GeneralHandler::load()
     Net::registerHandler(mTradeHandler.get());
 }
 
+void GeneralHandler::reload()
+{
+    // Nothing needed yet
+}
+
 void GeneralHandler::unload()
 {
     Net::clearHandlers();
diff --git a/src/net/tmwserv/generalhandler.h b/src/net/tmwserv/generalhandler.h
index 6c1d849f..ef533489 100644
--- a/src/net/tmwserv/generalhandler.h
+++ b/src/net/tmwserv/generalhandler.h
@@ -35,6 +35,8 @@ class GeneralHandler : public Net::GeneralHandler
 
         void load();
 
+        void reload();
+
         void unload();
 
         void flushNetwork();
diff --git a/src/net/tmwserv/loginhandler.cpp b/src/net/tmwserv/loginhandler.cpp
index 645d574c..dfe0e151 100644
--- a/src/net/tmwserv/loginhandler.cpp
+++ b/src/net/tmwserv/loginhandler.cpp
@@ -313,6 +313,11 @@ void LoginHandler::loginAccount(LoginData *loginData)
             loginData->password);
 }
 
+void LoginHandler::logout()
+{
+    // TODO
+}
+
 void LoginHandler::changeEmail(const std::string &email)
 {
     Net::AccountServer::Account::changeEmail(email);
diff --git a/src/net/tmwserv/loginhandler.h b/src/net/tmwserv/loginhandler.h
index 754fa71b..66f243b7 100644
--- a/src/net/tmwserv/loginhandler.h
+++ b/src/net/tmwserv/loginhandler.h
@@ -49,6 +49,8 @@ class LoginHandler : public MessageHandler, public Net::LoginHandler
 
         void loginAccount(LoginData *loginData);
 
+        void logout();
+
         void changeEmail(const std::string &email);
 
         void changePassword(const std::string &username,