X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.h;h=cc30c9518288e3886a6711a937a9d4b22133cddf;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=872ad0c92ed739ea1e714da24b132d1870223e3d;hpb=d7befe3a14be8f01d6d7288a6970358a4749368d;p=l2e.git

diff --git a/src/map/Entity.h b/src/map/Entity.h
index 872ad0c..cc30c95 100644
--- a/src/map/Entity.h
+++ b/src/map/Entity.h
@@ -8,6 +8,8 @@
 #ifndef MAP_ENTITY_H_
 #define MAP_ENTITY_H_
 
+#include "../battle/fwd.h"
+#include "../battle/Monster.h"
 #include "../geometry/Vector.h"
 #include "../graphics/fwd.h"
 #include "../graphics/Animation.h"
@@ -32,6 +34,8 @@ public:
 	};
 	enum Flags {
 		FLAG_NONBLOCKING = 0x01,
+		FLAG_PUSHABLE = 0x02,
+		FLAG_FIXED_ORIENTATION = 0x04,
 	};
 
 public:
@@ -41,8 +45,10 @@ public:
 	geometry::Vector<float> &Velocity() { return velocity; }
 	const geometry::Vector<float> &Velocity() const { return velocity; }
 
-	geometry::Vector<float> &SpriteOffset() { return spriteOffset; }
-	const geometry::Vector<float> &SpriteOffset() const { return spriteOffset; }
+	geometry::Vector<int> &SpriteOffset() { return spriteOffset; }
+	const geometry::Vector<int> &SpriteOffset() const { return spriteOffset; }
+
+	void ResetPosition(const geometry::Vector<int> &tileSize) { position = tilePosition * tileSize; }
 
 	void SetAnimation(const graphics::Animation *a);
 	void StartAnimation(app::Application &ctrl);
@@ -50,16 +56,28 @@ public:
 	void StopAnimation();
 	bool AnimationRunning() const { return runner.Running(); }
 
+	void SetSprite(const graphics::Sprite *s) { sprite = s; }
+
 	void SetOrientation(Orientation);
 	Orientation GetOrientation() const { return orientation; }
 	void SetSpeed(float);
 
+	void SetHandsFree();
+	void SetCarrying();
+	void SetPushing();
+
 	void SetFlags(int f) { flags = f; }
 	bool Blocking() const { return !(flags & FLAG_NONBLOCKING); }
-	bool Hostile() const {
-		// NOTE: this is a stub for testing!
-		return Blocking();
-	}
+	bool Hostile() const { return partyLayout && numMonsters > 0; }
+	bool Pushable() const { return flags & FLAG_PUSHABLE; }
+	bool CanTurn() const { return !(flags & FLAG_FIXED_ORIENTATION); }
+
+	void SetPartyLayout(battle::PartyLayout *l) { partyLayout = l; }
+	battle::PartyLayout *PartyLayout() { return partyLayout; }
+
+	void SetMonsters(battle::Monster *m, int num) { monsters = m; numMonsters = num; }
+	battle::Monster *MonstersBegin() { return monsters; }
+	battle::Monster *MonstersEnd() { return monsters + numMonsters; }
 
 	Entity *Follower() { return follower; }
 	const Entity *Follower() const { return follower; }
@@ -72,14 +90,23 @@ public:
 
 	void Render(SDL_Surface *, const geometry::Vector<int> &offset) const;
 
+	static void CreateTypeDescription();
+	static void Construct(void *);
+	static void Load(void *);
+
 private:
 	void UpdateVelocity();
 
 private:
 	Entity *follower;
 	const graphics::Animation *animation;
+	const graphics::Sprite *sprite;
+	battle::PartyLayout *partyLayout;
+	battle::Monster *monsters;
+	int numMonsters;
 	graphics::AnimationRunner runner;
-	geometry::Vector<float> spriteOffset;
+	geometry::Vector<int> spriteOffset;
+	geometry::Vector<int> tilePosition;
 	geometry::Vector<float> position;
 	geometry::Vector<float> velocity;
 	Orientation orientation;