X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=fe1b309a3a65b36543de7d8585290f6503b9139f;hb=b53c2ec2621ccc654e819cb203dc26e0a482bd41;hp=720d70802c161b22a0cc451fd6db89d419713538;hpb=c68b073db752dcdcf8c900efba7d8a5da091751c;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 720d708..fe1b309 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -78,9 +78,8 @@ void BattleState::Resize(int w, int h) {
 
 
 void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
-	monstersLayout->CalculatePositions(background->w, background->h, monsterPositions);
-	heroesLayout->CalculatePositions(background->w, background->h, heroesPositions);
 	for (int i(0); i < 4; ++i) {
+		heroes[i].Position() = heroesLayout->CalculatePosition(i, background->w, background->h);
 		heroes[i].SpellMenu() = res->spellMenuPrototype;
 		heroes[i].UpdateSpellMenu();
 		heroes[i].IkariMenu() = res->ikariMenuPrototype;
@@ -89,6 +88,10 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 		smallHeroTags[i] = SmallHeroTag(this, i);
 	}
 
+	for (int i(0); i < int(monsters.size()); ++i) {
+		monsters[i].Position() = monstersLayout->CalculatePosition(i, background->w, background->h);
+	}
+
 	int tagHeight(attackTypeMenu.Height());
 	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2);
 	int xOffset((Width() - 2 * tagWidth) / 2);
@@ -190,10 +193,9 @@ void BattleState::CalculateAttackOrder() {
 	}
 	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
 		attackOrder.push_back(Order(i, true));
+		MonsterAt(i).GetAttackChoice() = AttackChoice(this);
 	}
 	std::sort(attackOrder.begin(), attackOrder.end(), OrderCompare(this));
-
-	monsterAttacks.resize(monsters.size(), AttackChoice(this));
 }
 
 void BattleState::NextAttack() {
@@ -218,7 +220,7 @@ bool BattleState::AttacksFinished() const {
 }
 
 void BattleState::CalculateDamage() {
-	AttackChoice &ac(CurrentAttack().isMonster ? monsterAttacks[CurrentAttack().index] : HeroAt(CurrentAttack().index).GetAttackChoice());
+	AttackChoice &ac(CurrentAttack().isMonster ? MonsterAt(CurrentAttack().index).GetAttackChoice() : HeroAt(CurrentAttack().index).GetAttackChoice());
 	if (ac.GetType() == AttackChoice::DEFEND) return;
 
 	if (CurrentAttack().isMonster) {
@@ -294,7 +296,7 @@ Uint16 BattleState::CalculateDamage(const Stats &attacker, const Stats &defender
 
 void BattleState::ApplyDamage() {
 	if (attackCursor < 0) return;
-	AttackChoice &ac(CurrentAttack().isMonster ? monsterAttacks[CurrentAttack().index] : HeroAt(CurrentAttack().index).GetAttackChoice());
+	AttackChoice &ac(CurrentAttack().isMonster ? MonsterAt(CurrentAttack().index).GetAttackChoice() : HeroAt(CurrentAttack().index).GetAttackChoice());
 	TargetSelection &ts(ac.Selection());
 	if (ts.TargetsEnemies()) {
 		for (int i(0); i < MaxMonsters(); ++i) {
@@ -319,7 +321,7 @@ void BattleState::ApplyDamage() {
 
 AttackChoice &BattleState::CurrentAttackAttackChoice() {
 	if (CurrentAttack().isMonster) {
-		return monsterAttacks[CurrentAttack().index];
+		return MonsterAt(CurrentAttack().index).GetAttackChoice();
 	} else {
 		return HeroAt(CurrentAttack().index).GetAttackChoice();
 	}
@@ -328,11 +330,13 @@ AttackChoice &BattleState::CurrentAttackAttackChoice() {
 void BattleState::ClearAllAttacks() {
 	attackCursor = -1;
 	activeHero = -1;
-	for (int i(0); i < numHeroes; ++i) {
-		heroes[i].GetAttackChoice() = AttackChoice(this);
+	for (int i(0); i < NumHeroes(); ++i) {
+		HeroAt(i).GetAttackChoice() = AttackChoice(this);
+	}
+	for (int i(0); i < MaxMonsters(); ++i) {
+		MonsterAt(i).GetAttackChoice() = AttackChoice(this);
 	}
 	attackOrder.clear();
-	monsterAttacks.clear();
 }
 
 
@@ -368,9 +372,9 @@ void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset)
 	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
 		if (MonsterPositionOccupied(i)) {
 			if (monsters[i].GetAnimation().Running()) {
-				monsters[i].GetAnimation().DrawCenter(screen, monsterPositions[i] + offset);
+				monsters[i].GetAnimation().DrawCenter(screen, monsters[i].Position() + offset);
 			} else {
-				monsters[i].Sprite()->DrawCenter(screen, monsterPositions[i] + offset);
+				monsters[i].Sprite()->DrawCenter(screen, monsters[i].Position() + offset);
 			}
 		}
 	}
@@ -380,10 +384,10 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 	assert(screen);
 	for (int i(0); i < numHeroes; ++i) {
 		if (heroes[i].GetAnimation().Running()) {
-			heroes[i].GetAnimation().DrawCenter(screen, heroesPositions[i] + offset);
+			heroes[i].GetAnimation().DrawCenter(screen, heroes[i].Position() + offset);
 		} else {
 			int row(heroes[i].Health() > 0 ? 0 : 2);
-			heroes[i].Sprite()->DrawCenter(screen, heroesPositions[i] + offset, 1, row);
+			heroes[i].Sprite()->DrawCenter(screen, heroes[i].Position() + offset, 1, row);
 		}
 	}
 }