added forwarding headers

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

diff --git a/src/battle/TargetSelection.h b/src/battle/TargetSelection.h
index b57a41df26c5d3ab80bd772b876f07221185cb02..06d6f44198cda86c59341b314d4034a824cddd8a 100644 (file)
--- a/src/battle/TargetSelection.h
+++ b/src/battle/TargetSelection.h
@@ -8,22 +8,21 @@
 #ifndef BATTLE_TARGETSELECTION_H_
 #define BATTLE_TARGETSELECTION_H_
 
-#include <vector>
+#include "fwd.h"
+#include "../common/fwd.h"
 
-namespace common { class TargetingMode; }
+#include <vector>
 
 namespace battle {
 
-class BattleState;
-
 class TargetSelection {
 
 public:
        explicit TargetSelection(BattleState *battle = 0, bool multiple = false, bool atEnemy = true);
 
 public:
-       bool TargetsEnemies() const { return enemy; }
-       bool TargetsHeroes() const { return !TargetsEnemies(); }
+       bool TargetsMonsters() const { return enemy; }
+       bool TargetsHeroes() const { return !TargetsMonsters(); }
        bool IsSelected(int index) const { return index >= 0 && index < int(selected.size()) && selected[index].type != State::IGNORE; }
        bool HasSelected() const { return selection >= 0; }
        int SingleSelection() const { return selection; }
@@ -35,7 +34,7 @@ public:
 
        void ReadMode(const common::TargetingMode &);
 
-       void SelectEnemies();
+       void SelectMonsters();
        void SelectHeroes();
        void Select(int index) { selected[index].type = State::SELECTED; selection = index; }
        void Unselect(int index) { selected[index].type = State::IGNORE; }