DRY ANIMAL_RADIUS code

Author: morganchristiansson

libs/s25main/ai/aijh/AIPlayerJH.cpp

@@ -32,6 +32,7 @@
 #include "nodeObjs/noFlag.h"
 #include "nodeObjs/noShip.h"
 #include "nodeObjs/noTree.h"
+#include "figures/nofHunter.h"
 #include "gameData/BuildingConsts.h"
 #include "gameData/BuildingProperties.h"
 #include "gameData/GameConsts.h"
@@ -1965,24 +1966,9 @@ bool AIPlayerJH::HuntablesinRange(const MapPoint pt, unsigned min)
     // check first if no other hunter(or hunter buildingsite) is nearby
     if(aii.isBuildingNearby(BuildingType::Hunter, pt, 14))
         return false;
-    const unsigned maxrange = 25;
 
-    const auto pointToAnimal = [this](const MapPoint pt, unsigned) -> const noAnimal* {
-        for(const noBase& fig : gwb.GetFigures(pt))
-        {
-            if(fig.GetType() == NodalObjectType::Animal)
-                return static_cast<const noAnimal*>(&fig);
-        }
-        return nullptr;
-    };
-
-    const auto canAnimalBeHunted = [this, pt, maxrange](const noAnimal* const animal) {
-        return animal && animal->CanHunted()
-               && gwb.FindHumanPath(pt, animal->GetPos(), maxrange);
-    };
-
-    const auto available_animals =
-      gwb.GetPointsInRadius(pt, ANIMAL_RADIUS, pointToAnimal, canAnimalBeHunted, true);
+    const auto available_animals = nofHunter::GetAnimalsInRange(gwb, pt, ANIMAL_RADIUS, 25,
+                                                               [](const noAnimal* a) { return a->CanHunted(); });
 
     return available_animals.size() >= min;
 }

libs/s25main/figures/nofHunter.cpp

@@ -129,26 +129,31 @@ void nofHunter::HandleDerivedEvent(unsigned /*id*/)
     }
 }
 
-void nofHunter::TryStartHunting()
+std::vector<noAnimal*> nofHunter::GetAnimalsInRange(const GameWorldBase& world, const MapPoint pos,
+                                                      unsigned radius, unsigned maxDistance,
+                                                      bool (*isValidAnimal)(const noAnimal*))
 {
-    // Find animals in a circle around building
-    const auto pointToAnimal = [world = this->world](const MapPoint pt, unsigned) -> noAnimal* {
-        for(auto& figure : world->GetFigures(pt))
+    const auto pointToAnimal = [&world](const MapPoint pt, unsigned) -> noAnimal* {
+        for(auto& figure : world.GetFigures(pt))
         {
-            if(figure.GetType() != NodalObjectType::Animal)
-                continue;
-            return static_cast<noAnimal*>(&figure);
+            if(figure.GetType() == NodalObjectType::Animal)
+                return static_cast<noAnimal*>(&figure);
         }
         return nullptr;
     };
 
-    const auto canAnimalBeHunted = [pos = this->pos](const noAnimal* const animal) {
-        return animal && animal->CanHunted()
-               && (pos == animal->GetPos() || world->FindHumanPath(pos, animal->GetPos(), MAX_HUNTING_DISTANCE));
+    const auto canAnimalBeUsed = [pos, maxDistance, &world, isValidAnimal](const noAnimal* const animal) {
+        return animal && isValidAnimal(animal)
+               && (pos == animal->GetPos() || world.FindHumanPath(pos, animal->GetPos(), maxDistance));
     };
 
-    const auto available_animals =
-      world->GetPointsInRadius(pos, ANIMAL_RADIUS, pointToAnimal, canAnimalBeHunted, true);
+    return world.GetPointsInRadius(pos, radius, pointToAnimal, canAnimalBeUsed, true);
+}
+
+void nofHunter::TryStartHunting()
+{
+    const auto available_animals = GetAnimalsInRange(*world, pos, ANIMAL_RADIUS, MAX_HUNTING_DISTANCE,
+                                                     [](const noAnimal* a) { return a->CanHunted(); });
 
     // Gibt es überhaupt ein Tier, das ich jagen kann?
     if(!available_animals.empty())

libs/s25main/figures/nofHunter.h

@@ -6,7 +6,9 @@
 
 #include "nofBuildingWorker.h"
 #include "gameTypes/Direction.h"
+#include <vector>
 
+class GameWorldBase;
 class noAnimal;
 class SerializedGameData;
 class nobUsual;
@@ -64,6 +66,11 @@ class nofHunter : public nofBuildingWorker
 
     void TryStartHunting();
 
+    /// Find animals in a radius around a position that satisfy a predicate and are reachable
+    static std::vector<noAnimal*> GetAnimalsInRange(const GameWorldBase& world, const MapPoint pos,
+                                                     unsigned radius, unsigned maxDistance,
+                                                     bool (*isValidAnimal)(const noAnimal*));
+
     /// das Tier ist nicht mehr verfügbar (von selbst gestorben o.Ä.)
     void AnimalLost();
     /// wird aufgerufen, wenn die Arbeit abgebrochen wird (von nofBuildingWorker aufgerufen)

libs/s25main/figures/nofSkinner.cpp

@@ -16,6 +16,7 @@
 #include "random/Random.h"
 #include "world/GameWorld.h"
 #include "nodeObjs/noAnimal.h"
+#include "figures/nofHunter.h"
 #include "gameData/GameConsts.h"
 #include "gameData/JobConsts.h"
 
@@ -188,23 +189,9 @@ void nofSkinner::TryStartSkinning()
         HandleStateWaiting1();
     else
     {
-        const auto pointToAnimal = [world = this->world](const MapPoint pt, unsigned) -> noAnimal* {
-            for(auto& figure : world->GetFigures(pt))
-            {
-                if(figure.GetType() != NodalObjectType::Animal)
-                    continue;
-                return checkedCast<noAnimal*>(&figure);
-            }
-            return nullptr;
-        };
-
-        const auto canAnimalBeSkinned = [pos = this->pos](const noAnimal* const animal) {
-            return animal && animal->CanBeSkinned()
-                   && (pos == animal->GetPos() || world->FindHumanPath(pos, animal->GetPos(), MAX_SKINNING_DISTANCE));
-        };
-
         const auto available_animals =
-          world->GetPointsInRadius(pos, ANIMAL_RADIUS, pointToAnimal, canAnimalBeSkinned, true);
+          nofHunter::GetAnimalsInRange(*world, pos, ANIMAL_RADIUS, MAX_SKINNING_DISTANCE,
+                                       [](const noAnimal* a) { return a->CanBeSkinned(); });
 
         if(!available_animals.empty())
         {