Make GeneralHandlers for both networks

Also make Net::LogoutHandler

1 files changed, 23 insertions, 3 deletions

diff --git a/src/net/tmwserv/loginhandler.h b/src/net/tmwserv/loginhandler.h
index 81dd273c..93d55396 100644
--- a/src/net/tmwserv/loginhandler.h
+++ b/src/net/tmwserv/loginhandler.h
@@ -22,19 +22,37 @@
 #ifndef NET_TMWSERV_LOGINHANDLER_H
 #define NET_TMWSERV_LOGINHANDLER_H
 
+#include "net/loginhandler.h"
 #include "net/messagehandler.h"
 
 class LoginData;
 
-class LoginHandler : public MessageHandler
+namespace TmwServ {
+
+class LoginHandler : public MessageHandler, public Net::LoginHandler
 {
     public:
         LoginHandler();
 
-        void setLoginData(LoginData *loginData);
-
         void handleMessage(MessageIn &msg);
 
+        void loginAccount(LoginData *loginData);
+
+        void changeEmail(const std::string &email);
+
+        void changePassword(const std::string &username,
+                           const std::string &oldPassword,
+                           const std::string &newPassword);
+
+        void chooseServer(int server);
+
+        void registerAccount(const std::string &username,
+                           const std::string &password,
+                           const std::string &email);
+
+        void unregisterAccount(const std::string &username,
+                           const std::string &password);
+
     private:
         void handleLoginResponse(MessageIn &msg);
         void handleRegisterResponse(MessageIn &msg);
@@ -44,4 +62,6 @@ class LoginHandler : public MessageHandler
         LoginData *mLoginData;
 };
 
+} // namespace TmwServ
+
 #endif // NET_TMWSERV_LOGINHANDLER_H