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

diff --git a/src/map/Entity.h b/src/map/Entity.h
index 872ad0c..13ecaca 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"
@@ -41,8 +43,8 @@ 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 SetAnimation(const graphics::Animation *a);
 	void StartAnimation(app::Application &ctrl);
@@ -56,10 +58,14 @@ public:
 
 	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; }
+
+	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 +78,21 @@ 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;
+	battle::PartyLayout *partyLayout;
+	battle::Monster *monsters;
+	int numMonsters;
 	graphics::AnimationRunner runner;
-	geometry::Vector<float> spriteOffset;
+	geometry::Vector<int> spriteOffset;
 	geometry::Vector<float> position;
 	geometry::Vector<float> velocity;
 	Orientation orientation;