Merge branch 'master' into feature-33-capsules

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

diff --git a/src/battle/TargetSelection.cpp b/src/battle/TargetSelection.cpp
index 1906c2bb7960ac4b1804300c34d8d498fb3cf8fc..961f57cf845cdf703014c83345dc569803a231f9 100644 (file)
--- a/src/battle/TargetSelection.cpp
+++ b/src/battle/TargetSelection.cpp
@@ -1,13 +1,7 @@
-/*
- * TargetSelection.cpp
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #include "TargetSelection.h"
 
 #include "BattleState.h"
+#include "../common/TargetingMode.h"
 
 namespace battle {
 
@@ -23,8 +17,23 @@ TargetSelection::TargetSelection(BattleState *battle, bool multiple, bool atEnem
        }
 }
 
-void TargetSelection::SelectEnemies() {
-       if (TargetsEnemies()) return;
+
+void TargetSelection::ReadMode(const common::TargetingMode &tm) {
+       if (tm.TargetsEnemy()) {
+               SelectMonsters();
+       } else {
+               SelectHeroes();
+       }
+       if (tm.TargetsSingle()) {
+               SelectSingle();
+       } else if (tm.TargetsMultiple()) {
+               SelectMultiple();
+       }
+}
+
+
+void TargetSelection::SelectMonsters() {
+       if (TargetsMonsters()) return;
        enemy = true;
        UnselectAll();
        cursor = 0;
@@ -42,23 +51,24 @@ void TargetSelection::SelectHeroes() {
 void TargetSelection::Reset() {
        UnselectAll();
        cursor = 0;
-       if (TargetsEnemies()) {
+       if (TargetsMonsters()) {
                FindNextEnemy();
        }
 }
 
 
 void TargetSelection::MoveUp() {
-       if (TargetsEnemies()) return;
+       if (TargetsMonsters()) return;
        if (cursor < 2) {
-               SelectEnemies();
+               SelectMonsters();
        } else {
                cursor -= 2;
        }
 }
 
 void TargetSelection::MoveRight() {
-       if (TargetsEnemies()) {
+       assert(battle);
+       if (TargetsMonsters()) {
                cursor = (cursor + 1) % battle->MaxMonsters();
                while (!battle->MonsterPositionOccupied(cursor)) {
                        cursor = (cursor + 1) % battle->MaxMonsters();
@@ -69,7 +79,8 @@ void TargetSelection::MoveRight() {
 }
 
 void TargetSelection::MoveDown() {
-       if (TargetsEnemies()) {
+       assert(battle);
+       if (TargetsMonsters()) {
                SelectHeroes();
                return;
        }
@@ -80,7 +91,8 @@ void TargetSelection::MoveDown() {
 }
 
 void TargetSelection::MoveLeft() {
-       if (TargetsEnemies()) {
+       assert(battle);
+       if (TargetsMonsters()) {
                cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();
                FindNextEnemy();
        } else {
@@ -89,6 +101,7 @@ void TargetSelection::MoveLeft() {
 }
 
 void TargetSelection::FindNextEnemy() {
+       assert(battle);
        int start(cursor);
        while (!battle->MonsterPositionOccupied(cursor)) {
                cursor = (cursor + battle->MaxMonsters() - 1) % battle->MaxMonsters();