X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FTargetSelection.cpp;h=1906c2bb7960ac4b1804300c34d8d498fb3cf8fc;hb=9718062e6ed305d9f8f1674ff172079688e78088;hp=b24772d55937820732ad0b356f76ab5b13c55cf3;hpb=cded7d136b41e22f363ec702f2288491c0006e3a;p=l2e.git

diff --git a/src/battle/TargetSelection.cpp b/src/battle/TargetSelection.cpp
index b24772d..1906c2b 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, State())
+, selected(battle ? (battle->MaxMonsters() > battle->NumHeroes() ? battle->MaxMonsters() : battle->NumHeroes()) : 0, State())
 , selection(-1)
 , cursor(0)
 , multiple(multiple)
@@ -59,9 +59,9 @@ void TargetSelection::MoveUp() {
 
 void TargetSelection::MoveRight() {
 	if (TargetsEnemies()) {
-		cursor = (cursor + 1) % battle->MonsterPositions().size();
+		cursor = (cursor + 1) % battle->MaxMonsters();
 		while (!battle->MonsterPositionOccupied(cursor)) {
-			cursor = (cursor + 1) % battle->MonsterPositions().size();
+			cursor = (cursor + 1) % battle->MaxMonsters();
 		}
 	} else {
 		cursor = (cursor + 1) % battle->NumHeroes();
@@ -81,7 +81,7 @@ void TargetSelection::MoveDown() {
 
 void TargetSelection::MoveLeft() {
 	if (TargetsEnemies()) {
-		cursor = (cursor + battle->MonsterPositions().size() - 1) % battle->MonsterPositions().size();
+		cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();
 		FindNextEnemy();
 	} else {
 		cursor = (cursor + battle->NumHeroes() - 1) % battle->NumHeroes();
@@ -91,7 +91,7 @@ void TargetSelection::MoveLeft() {
 void TargetSelection::FindNextEnemy() {
 	int start(cursor);
 	while (!battle->MonsterPositionOccupied(cursor)) {
-		cursor = (cursor + battle->MonsterPositions().size() - 1) % battle->MonsterPositions().size();
+		cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();
 		if (cursor == start) break;
 	}
 }