X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=525889591d5847e8088e0c5753d28f67e6d7cfc6;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=3a9500c5d5228d41c2bd71ba42a27d593c41a4a3;hpb=e1edc92c4fb834c8061118e89c0d7e239742b030;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 3a9500c..5258895 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -15,7 +15,7 @@
 #include "../common/GameConfig.h"
 #include "../common/fwd.h"
 #include "../common/Stats.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Animation.h"
 #include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
@@ -76,7 +76,9 @@ public:
 	const Monster &MonsterAt(int index) const { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
 
 	const HeroTag &HeroTagAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTags[index]; }
-	const geometry::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+	const math::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+
+	Capsule &GetCapsule() { return capsule; }
 
 	bool HasChosenAttackType() const { return ActiveHero().GetAttackChoice().GetType() != AttackChoice::UNDECIDED; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
@@ -91,10 +93,20 @@ public:
 	void SetRunaway() { ranAway = true; }
 
 	struct Order {
-		Order(int index, bool isMonster)
-		: index(index), isMonster(isMonster) { }
+		enum Performer {
+			HERO,
+			CAPSULE,
+			MONSTER,
+		};
+		Order(Performer by, int index = 0)
+		: index(index), by(by) { }
+		AttackChoice &GetAttackChoice(BattleState &) const;
+		common::Stats &GetStats(BattleState &) const;
+		bool IsHero() const { return by == HERO; }
+		bool IsCapsule() const { return by == CAPSULE; }
+		bool IsMonster() const { return by == MONSTER; }
 		int index;
-		bool isMonster;
+		Performer by;
 	};
 
 	void CalculateAttackOrder();
@@ -110,21 +122,21 @@ public:
 	bool Defeat() const;
 
 public:
-	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
-		return geometry::Vector<int>(
+	math::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
+		return math::Vector<int>(
 				(screen->w - background->w) / 2,
 				(screen->h - background->h) / 2);
 	}
 	int Width() const { return background->w; }
 	int Height() const { return background->h; }
-	geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
+	math::Vector<int> Size() const { return math::Vector<int>(Width(), Height()); }
 
-	void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderCapsule(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderBackground(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderMonsters(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderHeroes(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderCapsule(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderSmallHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
 	virtual void OnEnterState(SDL_Surface *screen);
@@ -137,7 +149,8 @@ private:
 private:
 	void LoadInventory();
 
-	void DecideMonsterAttack(Monster &) const;
+	void DecideMonsterAttack(Monster &);
+	void DecideCapsuleAttack();
 	void CalculateDamage(const common::Stats &attackerStats, TargetSelection &targets) const;
 	Uint16 CalculateDamage(const common::Stats &attacker, const common::Stats &defender) const;
 
@@ -155,8 +168,8 @@ private:
 	graphics::Menu<const common::Item *> itemMenu;
 	HeroTag heroTags[4];
 	SmallHeroTag smallHeroTags[4];
-	geometry::Vector<int> heroTagPositions[4];
-	geometry::Vector<int> smallHeroTagPositions[4];
+	math::Vector<int> heroTagPositions[4];
+	math::Vector<int> smallHeroTagPositions[4];
 	Capsule capsule;
 	int numHeroes;
 	int activeHero;