X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=6aae5d7401395ed3997b4c0b889440d6f280e2e6;hb=6db6d2adbc3e36b385d6c508e416060afa44dd7a;hp=acb8194746ee46a7bb675882f603a8038e054411;hpb=cded7d136b41e22f363ec702f2288491c0006e3a;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index acb8194..6aae5d7 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -140,16 +140,16 @@ void PerformAttacks::HandleEvents(const Input &input) {
 }
 
 void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
-	if (ts.TargetsEnemies()) {
+	if (ts.TargetsMonsters()) {
 		for (int i(0); i < battle->MaxMonsters(); ++i) {
 			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 {
@@ -251,9 +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());
-	for (vector<Point<int> >::size_type i(0), end(ts.TargetsHeroes() ? battle->NumHeroes() : battle->MaxMonsters()); i < end; ++i) {
-		if (ts.IsSelected(i)) {
-			targetAnimation.DrawCenter(screen, (ts.TargetsHeroes() ? battle->HeroAt(i).Position() : battle->MonsterPositions()[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);
+			}
 		}
 	}
 }