X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=ff0672da84a2f365b8379455437c109e72779c41;hb=d872d756e64b8f1f57cba64ae19f479f8eab3927;hp=074578e18312252295b6da1dcb210b262243bff5;hpb=b782e097508340f375a06f0f293775eb86c3df9c;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 074578e..ff0672d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -24,6 +24,11 @@
 #include <SDL.h>
 
 namespace app { class Input; }
+namespace common {
+	class Inventory;
+	class Item;
+	class Spell;
+}
 namespace graphics {
 	class Font;
 	class Frame;
@@ -75,15 +80,32 @@ public:
 	void PreviousHero() { --activeHero; }
 	Hero &ActiveHero() { return heroes[activeHero]; }
 	const Hero &ActiveHero() const { return heroes[activeHero]; }
+	Hero &HeroAt(std::vector<Hero>::size_type index) { return heroes[index]; }
+	const Hero &HeroAt(std::vector<Hero>::size_type index) const { return heroes[index]; }
+	const HeroTag &ActiveHeroTag() const { return heroTags[activeHero]; }
+	const HeroTag &HeroTagAt(std::vector<Hero>::size_type index) const { return heroTags[index]; }
+	const geometry::Point<int> &HeroTagPositionAt(std::vector<Hero>::size_type index) const { return heroTagPositions[index]; }
 	bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
 	void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
+	AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
+	const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
+	TargetSelection &ActiveHeroTargets() { return attackChoices[activeHero].Selection(); }
+	const TargetSelection &ActiveHeroTargets() const { return attackChoices[activeHero].Selection(); }
 	bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
-	graphics::Menu</* Spell */ void *> &GetSpellMenu() { return spellMenus[activeHero]; }
-	const graphics::Menu</* Spell */ void *> &GetSpellMenu() const { return spellMenus[activeHero]; }
+
+	graphics::Menu<const common::Spell *> &GetSpellMenu() { return spellMenus[activeHero]; }
+	const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return spellMenus[activeHero]; }
 	graphics::Menu</* Ikari or Item */ void *> &GetIkariMenu() { return ikariMenus[activeHero]; }
 	const graphics::Menu</* Ikari or Item */ void *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
-	graphics::Menu</* Item */ void *> &GetItemMenu() { return itemMenu; }
-		const graphics::Menu</* Item */ void *> &GetItemMenu() const { return itemMenu; }
+	graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
+	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
+
+	const std::vector<geometry::Point<int> > &MonsterPositions() const { return monsterPositions; }
+	bool MonsterPositionOccupied(int index) { return index >= 0 && index < int(monsters.size()) && monsters[index].Health() > 0; }
+	const std::vector<geometry::Point<int> > &HeroesPositions() const { return heroesPositions; }
+	bool HeroPositionOccupied(int index) { return index >= 0 && index < int(heroes.size()); }
+	std::vector<Hero> &Heroes() { return heroes; }
+	const std::vector<Hero> &Heroes() const { return heroes; }
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -99,6 +121,10 @@ public:
 	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
+private:
+	void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
+	void LoadInventory();
+
 private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
@@ -106,15 +132,17 @@ private:
 	const Resources *res;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
+	// TODO: combine all data about heros or monsters
 	std::vector<geometry::Point<int> > monsterPositions;
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	std::vector<Hero> heroes;
-	std::vector<graphics::Menu</* Spell */ void *> > spellMenus;
-	graphics::Menu</* Item */ void *> itemMenu;
+	std::vector<graphics::Menu<const common::Spell *> > spellMenus;
+	graphics::Menu<const common::Item *> itemMenu;
 	std::vector<graphics::Menu</* Ikari or Item */ void *> > ikariMenus;
-	std::vector<HeroTag> heroTags;
-	std::vector<AttackChoice> attackChoices;
+	HeroTag heroTags[4];
+	geometry::Point<int> heroTagPositions[4];
+	AttackChoice attackChoices[4];
 	int activeHero;
 
 };