X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=806b4af59154525475ce3765532dc9600e2c3c6b;hb=93cd8cb0f16c1809d76faa33ed6f281a3276140b;hp=d22d6894d314bb44f98223bce046ae7edc313a76;hpb=cb86f68c08eec5c2e131037116bf9a9f5cf9f2c7;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index d22d689..806b4af 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -16,7 +16,6 @@
 #include "Resources.h"
 #include "SmallHeroTag.h"
 #include "../app/State.h"
-#include "../geometry/Point.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
@@ -99,7 +98,7 @@ 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::Point<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+	const geometry::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
 
 	bool HasChosenAttackType() const { return ActiveHero().GetAttackChoice().GetType() != AttackChoice::UNDECIDED; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
@@ -140,6 +139,7 @@ public:
 	}
 	int Width() const { return background->w; }
 	int Height() const { return background->h; }
+	geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
 
 	void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
@@ -150,6 +150,8 @@ public:
 private:
 	void LoadInventory();
 
+	void DecideMonsterAttack(Monster &) const;
+	void CalculateDamage(const Stats &attackerStats, TargetSelection &targets) const;
 	Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
 
 private:
@@ -165,8 +167,8 @@ private:
 	graphics::Menu<const common::Item *> itemMenu;
 	HeroTag heroTags[4];
 	SmallHeroTag smallHeroTags[4];
-	geometry::Point<int> heroTagPositions[4];
-	geometry::Point<int> smallHeroTagPositions[4];
+	geometry::Vector<int> heroTagPositions[4];
+	geometry::Vector<int> smallHeroTagPositions[4];
 	int numHeroes;
 	int activeHero;
 	int attackCursor;