1 files changed, 38 insertions, 10 deletions

diff --git a/src/gui/register.h b/src/gui/register.h
index 79578461..fde82a40 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -1,33 +1,33 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_REGISTER_H
-#define _TMW_REGISTER_H
+#ifndef REGISTER_H
+#define REGISTER_H
+
+#include <string>
 
-#include <iosfwd>
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
 #include "window.h"
-#include "../guichanfwd.h"
 
 class LoginData;
 class OkDialog;
@@ -82,16 +82,44 @@ class RegisterDialog : public Window, public gcn::ActionListener,
          * Returns whether submit can be enabled. This is true in the register
          * state, when all necessary fields have some text.
          */
-        bool
-        canSubmit();
+        bool canSubmit() const;
+
+#ifdef EATHENA_SUPPORT 
+        /**
+         * Function to decide whether string is an unsigned short or not
+         *
+         * @param str the string to parse
+         *
+         * @return true if str is an unsigned short, false otherwise
+         */
+        static bool isUShort(const std::string &str);
+
+        /**
+         * Converts string to an unsigned short (undefined if invalid)
+         *
+         * @param str the string to parse
+         *
+         * @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;