moved monster's position to Monster

[l2e.git] / src / battle / TargetSelection.cpp

diff --git a/src/battle/TargetSelection.cpp b/src/battle/TargetSelection.cpp
index c1aedf3ca7d8a253b05b368812801a8b3ce6cf67..1906c2bb7960ac4b1804300c34d8d498fb3cf8fc 100644 (file)
--- 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 ? (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();
@@ -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();
+               cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();
+               if (cursor == start) break;
        }
 }