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, 21 insertions, 1 deletions

diff --git a/src/gui/register.h b/src/gui/register.h
index 9588e07e..fde82a40 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -31,7 +31,19 @@
 
 class LoginData;
 class OkDialog;
-class WrongDataNoticeListener;
+
+/**
+ * Listener used while dealing with wrong data. It is used to direct the focus
+ * to the field which contained wrong data when the Ok button was pressed on
+ * the error notice.
+ */
+class WrongDataNoticeListener : public gcn::ActionListener {
+    public:
+        void setTarget(gcn::TextField *textField);
+        void action(const gcn::ActionEvent &event);
+    private:
+        gcn::TextField *mTarget;
+};
 
 /**
  * The registration dialog.
@@ -72,6 +84,7 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          */
         bool canSubmit() const;
 
+#ifdef EATHENA_SUPPORT 
         /**
          * Function to decide whether string is an unsigned short or not
          *
@@ -89,17 +102,24 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          * @return the value str represents
          */
         static unsigned short getUShort(const std::string &str);
+#endif
 
         gcn::TextField *mUserField;
         gcn::TextField *mPasswordField;
         gcn::TextField *mConfirmField;
+#ifdef EATHENA_SUPPORT 
         gcn::TextField *mServerField;
         gcn::TextField *mPortField;
+#else
+        gcn::TextField *mEmailField;
+#endif
 
         gcn::Button *mRegisterButton;
         gcn::Button *mCancelButton;
+#ifdef EATHENA_SUPPORT 
         gcn::RadioButton *mMaleButton;
         gcn::RadioButton *mFemaleButton;
+#endif
 
         WrongDataNoticeListener *mWrongDataNoticeListener;