X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=44831791d2c749695cc83716d099178c6f552f67;hb=b53c2ec2621ccc654e819cb203dc26e0a482bd41;hp=15c4feba5ab0633cd0acf638ebc1aa0ea2b28d3e;hpb=9cfff98ffce0529c685fbd5aa52e213c295449a1;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 15c4feb..4483179 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -77,10 +77,10 @@ void PerformAttacks::HandleEvents(const Input &input) {
 		targetAnimation = AnimationRunner(monster.MeleeAnimation());
 		moveAnimation = AnimationRunner(monster.AttackAnimation());
 		monster.SetAnimation(moveAnimation);
-		AddNumberAnimations(battle->MonsterAttackChoiceAt(battle->CurrentAttack().index).Selection());
+		AddNumberAnimations(battle->MonsterAt(battle->CurrentAttack().index).GetAttackChoice().Selection());
 	} else {
 		Hero &hero(battle->HeroAt(battle->CurrentAttack().index));
-		const AttackChoice &ac(battle->AttackChoiceAt(battle->CurrentAttack().index));
+		const AttackChoice &ac(battle->HeroAt(battle->CurrentAttack().index).GetAttackChoice());
 
 		switch (ac.GetType()) {
 			case AttackChoice::SWORD:
@@ -121,11 +121,17 @@ void PerformAttacks::HandleEvents(const Input &input) {
 				moveAnimation.Clear();
 				break;
 		}
-		hero.SetAnimation(moveAnimation);
 	}
 
 	if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(850);
-	if (moveAnimation.Valid()) moveAnimation.Start(*this);
+	if (moveAnimation.Valid()) {
+		moveAnimation.Start(*this);
+		if (battle->CurrentAttack().isMonster) {
+			battle->MonsterAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+		} else {
+			battle->HeroAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+		}
+	}
 	if (targetAnimation.Valid()) {
 		targetAnimationTimer = GraphicsTimers().StartCountdown(150);
 	} else {
@@ -139,11 +145,11 @@ void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
 			if (ts.IsBad(i)) {
 				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
 				numberPosition.push_back(
-						battle->MonsterPositions()[i]);
+						battle->MonsterAt(i).Position());
 			} else if (ts.IsGood(i)) {
 				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
 				numberPosition.push_back(
-						battle->MonsterPositions()[i]);
+						battle->MonsterAt(i).Position());
 			}
 		}
 	} else {
@@ -151,11 +157,11 @@ void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
 			if (ts.IsBad(i)) {
 				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
 				numberPosition.push_back(
-						battle->HeroesPositions()[i]);
+						battle->HeroAt(i).Position());
 			} else if (ts.IsGood(i)) {
 				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
 				numberPosition.push_back(
-						battle->HeroesPositions()[i]);
+						battle->HeroAt(i).Position());
 			}
 		}
 	}
@@ -245,10 +251,17 @@ void PerformAttacks::RenderNumbers(SDL_Surface *screen, const Vector<int> &offse
 void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
 	if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
 	const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
-	const vector<Point<int> > &positions(ts.TargetsHeroes() ? battle->HeroesPositions() : battle->MonsterPositions());
-	for (vector<Point<int> >::size_type i(0), end(positions.size()); i < end; ++i) {
-		if (ts.IsSelected(i)) {
-			targetAnimation.DrawCenter(screen, positions[i] + offset);
+	if (ts.TargetsHeroes()) {
+		for (vector<Point<int> >::size_type i(0), end(battle->NumHeroes()); i < end; ++i) {
+			if (ts.IsSelected(i)) {
+				targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + offset);
+			}
+		}
+	} else {
+		for (vector<Point<int> >::size_type i(0), end(battle->MaxMonsters()); i < end; ++i) {
+			if (ts.IsSelected(i)) {
+				targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + offset);
+			}
 		}
 	}
 }