Some more include cleanups.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 19 insertions, 13 deletions

diff --git a/src/being.h b/src/being.h
index 812ffdd3..109a44ad 100644
--- a/src/being.h
+++ b/src/being.h
@@ -22,37 +22,39 @@
 #ifndef BEING_H
 #define BEING_H
 
-#include <list>
-#include <memory>
+#include <guichan/color.hpp>
+
 #include <SDL_types.h>
+
 #include <string>
 #include <vector>
 #include <bitset>
 
-#include "animatedsprite.h"
-#include "effectmanager.h"
-#include "map.h"
 #include "particlecontainer.h"
 #include "position.h"
 #include "sprite.h"
 
-#include "gui/speechbubble.h"
-
-#include "resources/colordb.h"
+#include "resources/spritedef.h"
 
 #define FIRST_IGNORE_EMOTE 14
 #define STATUS_EFFECTS 32
 
 class AnimatedSprite;
+class Image;
 class ItemInfo;
 class Item;
 class Map;
 class Graphics;
 class Particle;
+class Position;
 class SpeechBubble;
 class Text;
 
-enum Gender {
+typedef std::list<Sprite*> Sprites;
+typedef Sprites::iterator SpriteIterator;
+
+enum Gender
+{
     GENDER_MALE = 0,
     GENDER_FEMALE = 1,
     GENDER_UNSPECIFIED = 2
@@ -61,7 +63,8 @@ enum Gender {
 class Being : public Sprite
 {
     public:
-        enum Type {
+        enum Type
+        {
             UNKNOWN,
             PLAYER,
             NPC,
@@ -71,7 +74,8 @@ class Being : public Sprite
         /**
          * Action the being is currently performing.
          */
-        enum Action {
+        enum Action
+        {
             STAND,
             WALK,
             ATTACK,
@@ -80,7 +84,8 @@ class Being : public Sprite
             HURT
         };
 
-        enum Sprite {
+        enum Sprite
+        {
             BASE_SPRITE = 0,
             SHOE_SPRITE,
             BOTTOMCLOTHES_SPRITE,
@@ -96,7 +101,8 @@ class Being : public Sprite
             VECTOREND_SPRITE
         };
 
-        enum TargetCursorSize {
+        enum TargetCursorSize
+        {
             TC_SMALL = 0,
             TC_MEDIUM,
             TC_LARGE,