From 69dab061daaa4b9a84eee0ea5cead89dfb4190a1 Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Mon, 24 May 2021 10:34:42 +0200
Subject: [PATCH] Further cleanup of TargetResolver.

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
---
 src/Battling/Flow/ResolveTarget.cpp | 22 +++++++++++-----------
 src/Battling/Flow/ResolveTarget.hpp |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Battling/Flow/ResolveTarget.cpp b/src/Battling/Flow/ResolveTarget.cpp
index eab79f7..fc34a48 100644
--- a/src/Battling/Flow/ResolveTarget.cpp
+++ b/src/Battling/Flow/ResolveTarget.cpp
@@ -3,6 +3,8 @@ using namespace ArbUt;
 using namespace CreatureLib::Library;
 using namespace CreatureLib::Battling;
 
+using TargetList = List<OptionalBorrowedPtr<Creature>>;
+
 static inline constexpr uint8_t GetOppositeSide(uint8_t v) {
     if (v == 1) {
         return 0;
@@ -10,8 +12,8 @@ static inline constexpr uint8_t GetOppositeSide(uint8_t v) {
     return 1;
 }
 
-static inline List<OptionalBorrowedPtr<Creature>> GetAll(const BorrowedPtr<Battle>& battle) {
-    List<OptionalBorrowedPtr<Creature>> arr(battle->GetCreaturesPerSide() * battle->GetSides().Count());
+static inline TargetList GetAll(const BorrowedPtr<Battle>& battle) {
+    TargetList arr(battle->GetCreaturesPerSide() * battle->GetSides().Count());
     for (auto* side : battle->GetSides()) {
         for (const auto& mon : side->GetCreatures()) {
             arr.Append(mon);
@@ -20,8 +22,7 @@ static inline List<OptionalBorrowedPtr<Creature>> GetAll(const BorrowedPtr<Battl
     return arr;
 }
 
-static inline List<OptionalBorrowedPtr<Creature>> GetAllAdjacent(const CreatureIndex& index,
-                                                                 const BorrowedPtr<Battle>& battle) {
+static inline TargetList GetAllAdjacent(const CreatureIndex& index, const BorrowedPtr<Battle>& battle) {
     auto left = index.GetCreatureIndex() - 1;
     auto right = index.GetCreatureIndex() + 1;
     if (left < 0 && right >= battle->GetCreaturesPerSide()) {
@@ -41,8 +42,7 @@ static inline List<OptionalBorrowedPtr<Creature>> GetAllAdjacent(const CreatureI
             battle->GetCreature(GetOppositeSide(index.GetSideIndex()), index.GetCreatureIndex())};
 }
 
-static inline List<OptionalBorrowedPtr<Creature>> GetAllAdjacentOpponent(const CreatureIndex& index,
-                                                                         const BorrowedPtr<Battle>& battle) {
+static inline TargetList GetAllAdjacentOpponent(const CreatureIndex& index, const BorrowedPtr<Battle>& battle) {
     auto left = index.GetCreatureIndex() - 1;
     auto right = index.GetCreatureIndex() + 1;
     if (left < 0 && right >= battle->GetCreaturesPerSide()) {
@@ -58,8 +58,8 @@ static inline List<OptionalBorrowedPtr<Creature>> GetAllAdjacentOpponent(const C
     return {battle->GetCreature(index), battle->GetCreature(index.GetSideIndex(), right)};
 }
 
-List<OptionalBorrowedPtr<Creature>> TargetResolver::ResolveTargets(const CreatureIndex& index, AttackTarget target,
-                                                                   const BorrowedPtr<Battle>& battle) {
+TargetList TargetResolver::ResolveTargets(const CreatureIndex& index, AttackTarget target,
+                                          const BorrowedPtr<Battle>& battle) {
     switch (target) {
         // Single targets should just return the mon at the index.
         case AttackTarget::Adjacent:
@@ -81,18 +81,18 @@ List<OptionalBorrowedPtr<Creature>> TargetResolver::ResolveTargets(const Creatur
             return GetAllAdjacentOpponent(index, battle);
         }
         case AttackTarget::AllAlly: {
-            List<OptionalBorrowedPtr<Creature>> arr(battle->GetCreaturesPerSide());
+            TargetList arr(battle->GetCreaturesPerSide());
             for (const auto& mon : battle->GetSides()[index.GetSideIndex()]->GetCreatures()) {
                 arr.Append(mon);
             }
             return arr;
         }
         case AttackTarget::AllOpponent: {
-            List<OptionalBorrowedPtr<Creature>> arr(battle->GetCreaturesPerSide());
+            TargetList arr(battle->GetCreaturesPerSide());
             for (const auto& mon : battle->GetSides()[index.GetSideIndex()]->GetCreatures()) {
                 arr.Append(mon);
             }
-            return List<OptionalBorrowedPtr<Creature>>(arr);
+            return arr;
         }
     }
     THROW("Unknown attack target kind: '" << AttackTargetHelper::ToString(target) << "'.")
diff --git a/src/Battling/Flow/ResolveTarget.hpp b/src/Battling/Flow/ResolveTarget.hpp
index a0044bf..926ac6a 100644
--- a/src/Battling/Flow/ResolveTarget.hpp
+++ b/src/Battling/Flow/ResolveTarget.hpp
@@ -4,14 +4,14 @@
 #include "../Models/Battle.hpp"
 #include "../Models/Creature.hpp"
 #include "../Models/CreatureIndex.hpp"
-using namespace CreatureLib::Battling;
 
 namespace CreatureLib::Battling {
     class TargetResolver {
+        typedef ArbUt::List<ArbUt::OptionalBorrowedPtr<Creature>> TargetList;
+
     public:
-        static ArbUt::List<ArbUt::OptionalBorrowedPtr<Creature>>
-        ResolveTargets(const CreatureIndex& index, CreatureLib::Library::AttackTarget target,
-                       const ArbUt::BorrowedPtr<Battle>& battle);
+        static TargetList ResolveTargets(const CreatureIndex& index, CreatureLib::Library::AttackTarget target,
+                                         const ArbUt::BorrowedPtr<Battle>& battle);
     };
 }