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, 2 insertions, 4 deletions

diff --git a/src/flooritem.h b/src/flooritem.h
index 99074943..61e88a70 100644
--- a/src/flooritem.h
+++ b/src/flooritem.h
@@ -24,14 +24,12 @@
 
 #include <list>
 
+#include "map.h"
 #include "sprite.h"
 
 class Graphics;
 class Image;
 class Item;
-class Map;
-
-typedef std::list<Sprite*> Sprites;
 
 /**
  * An item lying on the floor.
@@ -100,7 +98,7 @@ class FloorItem : public Sprite
         int mId;
         int mX, mY;
         Item *mItem;
-        Sprites::iterator mSpriteIterator;
+        MapSprite mMapSprite;
         Map *mMap;
 };