X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FMonster.h;h=3497c04b4ddd184617604fb9f584c045e84e84b4;hb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;hp=6013ebe47a027bf4fad44ca172ffa749a3945f6a;hpb=d4609ba1798d82cce128b5985d60cb212b760246;p=l2e.git

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 6013ebe..3497c04 100644
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -8,16 +8,15 @@
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
+#include "AttackChoice.h"
 #include "Stats.h"
+#include "../common/fwd.h"
+#include "../geometry/Vector.h"
+#include "../graphics/Animation.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace common { class Item; }
-namespace graphics {
-	class Animation;
-	class Sprite;
-}
-
 namespace battle {
 
 class Monster {
@@ -52,13 +51,17 @@ public:
 	const /* Script */ void *AttackScript() { return attackScript; }
 	const /* Script */ void *DefenseScript() { return defenseScript; }
 
-	graphics::Animation *MeleeAnimation() { return meleeAnimation; }
+	graphics::AnimationRunner &GetAnimation() { return animation; }
+	const graphics::AnimationRunner &GetAnimation() const { return animation; }
+	void SetAnimation(const graphics::AnimationRunner &a) { animation = a; }
+
 	const graphics::Animation *MeleeAnimation() const { return meleeAnimation; }
-	graphics::Animation *AttackAnimation() { return attackAnimation; }
 	const graphics::Animation *AttackAnimation() const { return attackAnimation; }
-	graphics::Animation *SpellAnimation() { return spellAnimation; }
 	const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
+	geometry::Vector<int> &Position() { return position; }
+	const geometry::Vector<int> &Position() const { return position; }
+
 // temporary setters until loader is implemented
 public:
 	void SetName(const char *n) { name = n; }
@@ -71,9 +74,15 @@ public:
 	void SetStats(const Stats &s) { stats = s; }
 	void SetReward(Uint16 exp, Uint16 gold) { expReward = exp; goldReward = gold; }
 
-	void SetMeleeAnimation(graphics::Animation *a) { meleeAnimation = a; }
-	void SetAttackAnimation(graphics::Animation *a) { attackAnimation = a; }
-	void SetSpellAnimation(graphics::Animation *a) { spellAnimation = a; }
+	void SetMeleeAnimation(const graphics::Animation *a) { meleeAnimation = a; }
+	void SetAttackAnimation(const graphics::Animation *a) { attackAnimation = a; }
+	void SetSpellAnimation(const graphics::Animation *a) { spellAnimation = a; }
+
+	AttackChoice &GetAttackChoice() { return attackChoice; }
+	const AttackChoice &GetAttackChoice() const { return attackChoice; }
+
+	static void CreateTypeDescription();
+	static void Construct(void *);
 
 private:
 	const char *name;
@@ -82,19 +91,25 @@ private:
 	/* Script */ void *attackScript;
 	/* Script */ void *defenseScript;
 
-	graphics::Animation *meleeAnimation;
-	graphics::Animation *attackAnimation;
-	graphics::Animation *spellAnimation;
+	const graphics::Animation *meleeAnimation;
+	const graphics::Animation *attackAnimation;
+	const graphics::Animation *spellAnimation;
+
+	graphics::AnimationRunner animation;
+
+	geometry::Vector<int> position;
+
+	AttackChoice attackChoice;
 
-	Uint16 maxHealth, health;
-	Uint16 maxMana, mana;
+	int maxHealth, health;
+	int maxMana, mana;
 
 	Stats stats;
 
-	Uint16 expReward, goldReward;
+	int expReward, goldReward;
 
-	Uint8 level;
-	Uint8 dropChance;
+	int level;
+	int dropChance;
 
 };