X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.h;h=4964efb81f788be75e23445c28f2e1e00b09805b;hb=cd302c7f04e5d0cdfd8e15322a02e84577ad2672;hp=e9eca69000c262ce599cfb578ef986d463039080;hpb=10f374a7dadbd3f239fc0abc76094e3e45889f95;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index e9eca69..4964efb 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -106,13 +106,7 @@ public:
 	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]; }
 
-	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 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 HasChosenAttackType() const { return ActiveHero().GetAttackChoice().GetType() != AttackChoice::UNDECIDED; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
 	int NumHeroes() const { return numHeroes; }
@@ -176,7 +170,6 @@ private:
 	std::vector<geometry::Point<int> > monsterPositions;
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
-	std::vector<AttackChoice> monsterAttacks;
 	std::vector<Order> attackOrder;
 	Hero heroes[4];
 	graphics::Menu<const common::Item *> itemMenu;