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, 13 insertions, 14 deletions

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 57dc8981..8fbfe70a 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -118,7 +118,12 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map):
 
     mUpdateName = true;
 
+    mTextColor = &guiPalette->getColor(Palette::PLAYER);
+    mNameColor = &guiPalette->getColor(Palette::SELF);
+
     initTargetCursor();
+
+    config.addListener("showownname", this);
 }
 
 LocalPlayer::~LocalPlayer()
@@ -241,20 +246,6 @@ void LocalPlayer::setGMLevel(int level)
         setGM(true);
 }
 
-void LocalPlayer::setName(const std::string &name)
-{
-    if (mName)
-    {
-        delete mName;
-        mName = 0;
-    }
-
-    if (config.getValue("showownname", false) && mMapInitialized)
-        Player::setName(name);
-    else
-        Being::setName(name);
-}
-
 void LocalPlayer::nextStep()
 {
     // TODO: Fix picking up when reaching target (this method is obsolete)
@@ -1087,3 +1078,11 @@ void LocalPlayer::addMessageToQueue(const std::string &message,
 {
     mMessages.push_back(MessagePair(message, color));
 }
+
+void LocalPlayer::optionChanged(const std::string &value)
+{
+    if (value == "showownname")
+    {
+        setShowName(config.getValue("showownname", 1));
+    }
+}