Revived the email field to fix registration crash

Now you can register new accounts on tmwserv again. The email field
apparently gots lost during the merge somewhere.

4 files changed, 10 insertions, 3 deletions

diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 66b9b7dd..6428fb7c 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(int previousState):
     setVisible(true);
 }
 
-void ConnectionDialog::action(gcn::ActionEvent const &)
+void ConnectionDialog::action(const gcn::ActionEvent &)
 {
     logger->log("Cancel pressed");
     state = mPreviousState;
diff --git a/src/gui/connection.h b/src/gui/connection.h
index ab586edd..62441fa9 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -47,7 +47,7 @@ class ConnectionDialog : public Window, gcn::ActionListener
          * Called when the user presses Cancel. Restores the global state to
          * the previous one.
          */
-        void action(gcn::ActionEvent const &);
+        void action(const gcn::ActionEvent &);
 
         void logic();
 
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 84875685..94ca8dc2 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -26,7 +26,6 @@
 
 #include <guichan/actionlistener.hpp>
 
-class IntTextField;
 class Item;
 
 /**
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 6700bca6..8442c3ea 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -63,6 +63,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
 #ifdef EATHENA_SUPPORT
     gcn::Label *serverLabel = new Label(_("Server:"));
     gcn::Label *portLabel = new Label(_("Port:"));
+#else
+    gcn::Label *emailLabel = new Label(_("Email:"));
 #endif
     mUserField = new TextField(loginData->username);
     mPasswordField = new PasswordField(loginData->password);
@@ -72,6 +74,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mPortField = new TextField(toString(loginData->port));
     mMaleButton = new RadioButton(_("Male"), "sex", true);
     mFemaleButton = new RadioButton(_("Female"), "sex", false);
+#else
+    mEmailField = new TextField;
 #endif
     mRegisterButton = new Button(_("Register"), "register", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
@@ -86,6 +90,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     place(2, 3, mFemaleButton);
     place(0, 4, serverLabel);
     place(0, 5, portLabel);
+#else
+    place(0, 3, emailLabel);
 #endif
     place(1, 0, mUserField, 3).setPadding(2);
     place(1, 1, mPasswordField, 3).setPadding(2);
@@ -93,6 +99,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
 #ifdef EATHENA_SUPPORT
     place(1, 4, mServerField, 3).setPadding(2);
     place(1, 5, mPortField, 3).setPadding(2);
+#else
+    place(1, 3, mEmailField, 3).setPadding(2);
 #endif
     place = getPlacer(0, 2);
     place(1, 0, mRegisterButton);