X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=806b4af59154525475ce3765532dc9600e2c3c6b;hb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;hp=654e147d8ed60a677be4107f314dbc41783413aa;hpb=9718062e6ed305d9f8f1674ff172079688e78088;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 654e147..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"
@@ -78,7 +77,6 @@ public:
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
-	// TODO: turn this mess into a well stuctured interface
 public:
 	const Resources &Res() const { return *res; }
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
@@ -100,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; }
@@ -141,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);
@@ -151,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:
@@ -160,15 +161,14 @@ private:
 	const Resources *res;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
-	// TODO: combine all data about heros or monsters
 	std::vector<Monster> monsters;
 	std::vector<Order> attackOrder;
 	Hero heroes[4];
 	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;