X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=4964efb81f788be75e23445c28f2e1e00b09805b;hb=cd302c7f04e5d0cdfd8e15322a02e84577ad2672;hp=bac9647590917e4cdf9aa547a9e7f619a066f26c;hpb=2147d00bbcb43f5cb4499091f646057cb6944cb3;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index bac9647..4964efb 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -107,10 +107,6 @@ public:
 	const geometry::Point<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
 
 	bool HasChosenAttackType() const { return ActiveHero().GetAttackChoice().GetType() != AttackChoice::UNDECIDED; }
-	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; }
 
 	int NumHeroes() const { return numHeroes; }
@@ -174,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;