Clean up Being and it's derivatives

Move stuff only needed for Players into Player (like slots and sprite
limits). Move name handling into Being (no need for three copies of
this code). Clean up terminology (including Map terminology). Remove
hair-related variables.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 5dbc6050..a30aadd3 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -22,7 +22,7 @@
 #ifndef CHAR_CREATE_H
 #define CHAR_CREATE_H
 
-#include "being.h"
+#include "player.h"
 #include "guichanfwd.h"
 #include "lockedarray.h"
 
@@ -34,7 +34,6 @@
 #include <vector>
 
 class LocalPlayer;
-class Player;
 class PlayerBox;
 
 /**
@@ -82,6 +81,8 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         void attemptCharCreate();
 
+        void updateHair();
+
         gcn::TextField *mNameField;
         gcn::Label *mNameLabel;
         gcn::Button *mNextHairColorButton;
@@ -108,6 +109,9 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         Player *mPlayer;
         PlayerBox *mPlayerBox;
 
+        int mHairStyle;
+        int mHairColor;
+
         int mSlot;
 };