1 files changed, 51 insertions, 16 deletions

diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index ed03cedd..0ff1d18f 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -1,38 +1,43 @@
 /*
  *  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 _CHAR_SELECT_H
 #define _CHAR_SELECT_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
+#include "../being.h"
 #include "../guichanfwd.h"
 #include "../lockedarray.h"
 
-#include <guichan/actionlistener.hpp>
-
+#ifdef TMWSERV_SUPPORT
 #include "../logindata.h"
+#else
+class Network;
+#endif
 
-class Player;
 class LocalPlayer;
+class Player;
 class PlayerBox;
 
 /**
@@ -47,8 +52,14 @@ class CharSelectDialog : public Window, public gcn::ActionListener
         /**
          * Constructor.
          */
+#ifdef TMWSERV_SUPPORT
         CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
                          LoginData *loginData);
+#else
+        CharSelectDialog(Network *network,
+                         LockedArray<LocalPlayer*> *charInfo,
+                         Gender gender);
+#endif
 
         void action(const gcn::ActionEvent &event);
 
@@ -59,28 +70,40 @@ class CharSelectDialog : public Window, public gcn::ActionListener
         bool selectByName(const std::string &name);
 
     private:
+#ifdef EATHENA_SUPPORT
+        Network *mNetwork;
+#endif
         LockedArray<LocalPlayer*> *mCharInfo;
 
         gcn::Button *mSelectButton;
         gcn::Button *mCancelButton;
-        gcn::Button *mNewCharButton;
-        gcn::Button *mDelCharButton;
         gcn::Button *mPreviousButton;
         gcn::Button *mNextButton;
-        gcn::Button *mUnRegisterButton;
-        gcn::Button *mChangePasswordButton;
-        gcn::Button *mChangeEmailButton;
 
-        gcn::Label *mAccountNameLabel;
         gcn::Label *mNameLabel;
         gcn::Label *mLevelLabel;
         gcn::Label *mMoneyLabel;
+        std::string mMoney;
 
         PlayerBox *mPlayerBox;
 
         bool mCharSelected;
 
+#ifdef TMWSERV_SUPPORT
+        gcn::Button *mNewCharButton;
+        gcn::Button *mDelCharButton;
+        gcn::Button *mUnRegisterButton;
+        gcn::Button *mChangePasswordButton;
+        gcn::Button *mChangeEmailButton;
+        gcn::Label *mAccountNameLabel;
+
         LoginData *mLoginData;
+#else
+        gcn::Button *mNewDelCharButton;
+        gcn::Label *mJobLevelLabel;
+        Gender mGender;
+#endif
+
         /**
          * Communicate character deletion to the server.
          */
@@ -103,7 +126,12 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         /**
          * Constructor.
          */
+#ifdef TMWSERV_SUPPORT
         CharCreateDialog(Window *parent, int slot);
+#else
+        CharCreateDialog(Window *parent, int slot, Network *network,
+                         Gender gender);
+#endif
 
         /**
          * Destructor.
@@ -118,9 +146,11 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         void unlock();
 
     private:
+#ifdef TMWSERV_SUPPORT
         int getDistributedPoints();
 
         void UpdateSliders();
+#endif
 
         /**
          * Returns the name of the character to create.
@@ -132,6 +162,9 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         void attemptCharCreate();
 
+#ifdef EATHENA_SUPPORT
+        Network *mNetwork;
+#endif
         gcn::TextField *mNameField;
         gcn::Label *mNameLabel;
         gcn::Button *mNextHairColorButton;
@@ -141,6 +174,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         gcn::Button *mPrevHairStyleButton;
         gcn::Label *mHairStyleLabel;
 
+#ifdef TMWSERV_SUPPORT
         gcn::RadioButton *mMale;
         gcn::RadioButton *mFemale;
 
@@ -149,6 +183,10 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         gcn::Label *mAttributeValue[6];
         gcn::Label *mAttributesLeft;
 
+        static const int mMaxPoints = 60;
+        int mUsedPoints;
+#endif
+
         gcn::Button *mCreateButton;
         gcn::Button *mCancelButton;
 
@@ -156,9 +194,6 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         PlayerBox *mPlayerBox;
 
         int mSlot;
-
-        static const int mMaxPoints = 60;
-        int mUsedPoints;
 };
 
 #endif