X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FTargetSelection.cpp;h=b24772d55937820732ad0b356f76ab5b13c55cf3;hb=9a273798937710928304fdcc5e33a78c6f8b48be;hp=85639074fd3f5ba998fcbd7ede41a625574b3ef2;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/battle/TargetSelection.cpp b/src/battle/TargetSelection.cpp
index 8563907..b24772d 100644
--- a/src/battle/TargetSelection.cpp
+++ b/src/battle/TargetSelection.cpp
@@ -13,7 +13,7 @@ namespace battle {
 
 TargetSelection::TargetSelection(BattleState *battle, bool multiple, bool atEnemy)
 : battle(battle)
-, selected(battle ? (battle->MonsterPositions().size() > battle->Heroes().size() ? battle->MonsterPositions().size() : battle->Heroes().size()) : 0, false)
+, selected(battle ? ((int)battle->MonsterPositions().size() > battle->NumHeroes() ? (int)battle->MonsterPositions().size() : battle->NumHeroes()) : 0, State())
 , selection(-1)
 , cursor(0)
 , multiple(multiple)
@@ -64,7 +64,7 @@ void TargetSelection::MoveRight() {
 			cursor = (cursor + 1) % battle->MonsterPositions().size();
 		}
 	} else {
-		cursor = (cursor + 1) % battle->Heroes().size();
+		cursor = (cursor + 1) % battle->NumHeroes();
 	}
 }
 
@@ -73,8 +73,8 @@ void TargetSelection::MoveDown() {
 		SelectHeroes();
 		return;
 	}
-	int newCursor(cursor + 2 % 4);
-	if (newCursor < int(battle->Heroes().size())) {
+	int newCursor((cursor + 2) % 4);
+	if (newCursor < battle->NumHeroes()) {
 		cursor = newCursor;
 	}
 }
@@ -84,13 +84,15 @@ void TargetSelection::MoveLeft() {
 		cursor = (cursor + battle->MonsterPositions().size() - 1) % battle->MonsterPositions().size();
 		FindNextEnemy();
 	} else {
-		cursor = (cursor + battle->Heroes().size() - 1) % battle->Heroes().size();
+		cursor = (cursor + battle->NumHeroes() - 1) % battle->NumHeroes();
 	}
 }
 
 void TargetSelection::FindNextEnemy() {
+	int start(cursor);
 	while (!battle->MonsterPositionOccupied(cursor)) {
 		cursor = (cursor + battle->MonsterPositions().size() - 1) % battle->MonsterPositions().size();
+		if (cursor == start) break;
 	}
 }