X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FTargetSelection.cpp;h=b24772d55937820732ad0b356f76ab5b13c55cf3;hb=51c5ffb4958968827b93624f7849c1b7d3a1eacb;hp=c1aedf3ca7d8a253b05b368812801a8b3ce6cf67;hpb=76539c6ba0ac1bc6ecd179cd0fc229f40872598b;p=l2e.git

diff --git a/src/battle/TargetSelection.cpp b/src/battle/TargetSelection.cpp
index c1aedf3..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 ? ((int)battle->MonsterPositions().size() > battle->NumHeroes() ? (int)battle->MonsterPositions().size() : battle->NumHeroes()) : 0, false)
+, selected(battle ? ((int)battle->MonsterPositions().size() > battle->NumHeroes() ? (int)battle->MonsterPositions().size() : battle->NumHeroes()) : 0, State())
 , selection(-1)
 , cursor(0)
 , multiple(multiple)
@@ -89,8 +89,10 @@ void TargetSelection::MoveLeft() {
 }
 
 void TargetSelection::FindNextEnemy() {
+	int start(cursor);
 	while (!battle->MonsterPositionOccupied(cursor)) {
 		cursor = (cursor + battle->MonsterPositions().size() - 1) % battle->MonsterPositions().size();
+		if (cursor == start) break;
 	}
 }