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, 1 insertions, 8 deletions

diff --git a/src/npc.h b/src/npc.h
index 392ee8c5..5335d8cd 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -32,11 +32,9 @@ class NPC : public Being
     public:
         NPC(int id, int job, Map *map);
 
-        ~NPC();
-
         void setName(const std::string &name);
 
-        virtual Type getType() const;
+        virtual Type getType() const { return Being::NPC; }
 
         void talk();
 
@@ -58,11 +56,6 @@ class NPC : public Being
          */
         virtual Map::BlockType getBlockType() const
         { return Map::BLOCKTYPE_CHARACTER; } //blocks like a player character
-
-        void updateCoords();
-
-    private:
-        Text *mName;
 };
 
 extern int current_npc;