X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=daf2c49124a7432c9b5847f81699d35601df63e5;hb=8967f42789c619df6e5874f5c6a9ea4b6b6c33db;hp=a64ea0e3306baf9f90431c00ed23dd8771de467a;hpb=c68b073db752dcdcf8c900efba7d8a5da091751c;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index a64ea0e..daf2c49 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -107,8 +107,8 @@ 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 &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]; }
+	AttackChoice &MonsterAttackChoiceAt(int index) { assert(index >= 0 && index < MaxMonsters()); return monsters[index].GetAttackChoice(); }
+	const AttackChoice &MonsterAttackChoiceAt(int index) const { assert(index >= 0 && index < MaxMonsters()); return monsters[index].GetAttackChoice(); }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
 	int NumHeroes() const { return numHeroes; }
@@ -172,7 +172,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;