X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=3561609e91c105a34413a8b29d042d7d1a0c50ce;hb=5121f4215d725f492bea084fb94900d7e5972743;hp=9f30fb5a1d439effc3b4ef8857ac1d7d69d1df60;hpb=9a273798937710928304fdcc5e33a78c6f8b48be;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 9f30fb5..3561609 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,7 +8,6 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
-#include "AttackChoice.h"
 #include "AttackTypeMenu.h"
 #include "Hero.h"
 #include "HeroTag.h"
@@ -41,6 +40,7 @@ namespace graphics {
 
 namespace battle {
 
+class AttackChoice;
 class PartyLayout;
 class Stats;
 
@@ -84,10 +84,10 @@ public:
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
 	MoveMenu &GetMoveMenu() { return moveMenu; }
 
-	graphics::Menu<const common::Spell *> &GetSpellMenu() { return spellMenus[activeHero]; }
-	const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return spellMenus[activeHero]; }
-	graphics::Menu<const common::Item *> &GetIkariMenu() { return ikariMenus[activeHero]; }
-	const graphics::Menu<const common::Item *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
+	graphics::Menu<const common::Spell *> &GetSpellMenu() { return heroes[activeHero].SpellMenu(); }
+	const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return heroes[activeHero].SpellMenu(); }
+	graphics::Menu<const common::Item *> &GetIkariMenu() { return heroes[activeHero].IkariMenu(); }
+	const graphics::Menu<const common::Item *> &GetIkariMenu() const { return heroes[activeHero].IkariMenu(); }
 	graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
 	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
 
@@ -109,8 +109,8 @@ public:
 	bool HasChosenAttackType() const { return ActiveHeroAttackChoice().GetType() != AttackChoice::UNDECIDED; }
 	AttackChoice &ActiveHeroAttackChoice() { return AttackChoiceAt(activeHero); }
 	const AttackChoice &ActiveHeroAttackChoice() const { return AttackChoiceAt(activeHero); }
-	AttackChoice &AttackChoiceAt(int index) { assert(index >= 0 && index < NumHeroes()); return attackChoices[index]; }
-	const AttackChoice &AttackChoiceAt(int index) const { assert(index >= 0 && index < NumHeroes()); return attackChoices[index]; }
+	AttackChoice &AttackChoiceAt(int index) { assert(index >= 0 && index < NumHeroes()); return heroes[index].GetAttackChoice(); }
+	const AttackChoice &AttackChoiceAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroes[index].GetAttackChoice(); }
 	AttackChoice &MonsterAttackChoiceAt(int index) { assert(index >= 0 && index < MaxMonsters()); return monsterAttacks[index]; }
 	const AttackChoice &MonsterAttackChoiceAt(int index) const { assert(index >= 0 && index < MaxMonsters()); return monsterAttacks[index]; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
@@ -161,8 +161,6 @@ public:
 	void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
-	void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
-	void LoadIkariMenu(std::vector<Hero>::size_type heroIndex);
 	void LoadInventory();
 
 	Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
@@ -181,14 +179,11 @@ private:
 	std::vector<AttackChoice> monsterAttacks;
 	std::vector<Order> attackOrder;
 	Hero heroes[4];
-	graphics::Menu<const common::Spell *> spellMenus[4];
 	graphics::Menu<const common::Item *> itemMenu;
-	graphics::Menu<const common::Item *> ikariMenus[4];
 	HeroTag heroTags[4];
 	SmallHeroTag smallHeroTags[4];
 	geometry::Point<int> heroTagPositions[4];
 	geometry::Point<int> smallHeroTagPositions[4];
-	AttackChoice attackChoices[4];
 	int numHeroes;
 	int activeHero;
 	int attackCursor;