Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 31 insertions, 1 deletions

diff --git a/src/logindata.h b/src/logindata.h
index 410d2e73..ae89eb5f 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -24,21 +24,51 @@
 
 #include <string>
 
+#include <string>
+
 struct LoginData
 {
     std::string username;
     std::string password;
+    std::string newPassword;
     std::string hostname;
     std::string updateHost;
+#ifdef TMWSERV_SUPPORT
+    std::string email;
+    std::string newEmail;
+#endif
     short port;
 
+#ifdef EATHENA_SUPPORT
     int account_ID;
     int session_ID1;
     int session_ID2;
     char sex;
+#endif
 
     bool remember;            /**< Whether to store the username and host. */
     bool registerLogin;       /**< Whether an account is being registered. */
-};
 
+    void clear()
+    {
+        username.clear();
+        password.clear();
+        newPassword.clear();
+        hostname.clear();
+        updateHost.clear();
+#ifdef TMWSERV_SUPPORT
+        email.clear();
+        newEmail.clear();
 #endif
+        port = 0;
+
+#ifdef EATHENA_SUPPORT
+        account_ID = 0;
+        session_ID1 = 0;
+        session_ID2 = 0;
+        sex = 0;
+#endif
+    };
+};
+
+#endif // LOGINDATA_H