Remove unused overload for figures with warehouse goal

Flamefire · Flow86 · commit 23fad66bed21 · 2026-02-07T13:38:46.000+01:00
It is never used and can cause confusion.
`nofPassiveWorker` should be used for transfers to a warehouse.
diff --git a/libs/s25main/factories/JobFactory.cpp b/libs/s25main/factories/JobFactory.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -95,34 +95,23 @@ std::unique_ptr<noFigure> JobFactory::CreateJob(const Job job_id, const MapPoint
             RTTR_Assert(dynamic_cast<nobUsual*>(goal));
             return std::make_unique<nofBaker>(pt, player, static_cast<nobUsual*>(goal));
         case Job::Helper:
-            // Wenn goal = 0 oder Lagerhaus, dann Auslagern anscheinend und mann kann irgendeinen Typ nehmen
-            if(!goal)
-                return std::make_unique<nofWellguy>(pt, player, static_cast<nobUsual*>(nullptr));
-            else if(goal->GetGOT() == GO_Type::NobStorehouse || goal->GetGOT() == GO_Type::NobHarborbuilding
-                    || goal->GetGOT() == GO_Type::NobHq)
-                return std::make_unique<nofWellguy>(pt, player, static_cast<nobBaseWarehouse*>(goal));
-            else if(goal->GetGOT() == GO_Type::NobUsual)
+            if(goal && goal->GetGOT() == GO_Type::NobUsual)
             {
+                RTTR_Assert(dynamic_cast<nobUsual*>(goal));
                 auto* goalBld = static_cast<nobUsual*>(goal);
                 if(goalBld->GetBuildingType() == BuildingType::Well)
                     return std::make_unique<nofWellguy>(pt, player, goalBld);
                 else if(goalBld->GetBuildingType() == BuildingType::Catapult)
                     return std::make_unique<nofCatapultMan>(pt, player, goalBld);
             }
-            throw std::runtime_error("Invalid goal type: " + helpers::toString(goal->GetGOT()) + " for job "
-                                     + helpers::toString(job_id));
+            throw std::runtime_error("Invalid goal type: " + (goal ? helpers::toString(goal->GetGOT()) : "NULL")
+                                     + " for job " + helpers::toString(job_id));
         case Job::Geologist:
             RTTR_Assert(dynamic_cast<noFlag*>(goal));
             return std::make_unique<nofGeologist>(pt, player, static_cast<noFlag*>(goal));
         case Job::Scout:
-            // Im Spähturm arbeitet ein anderer Späher-Typ
-            // Wenn goal = 0 oder Lagerhaus, dann Auslagern anscheinend und mann kann irgendeinen Typ nehmen
-            if(!goal)
-                return std::make_unique<nofScout_LookoutTower>(pt, player, static_cast<nobUsual*>(nullptr));
-            else if(goal->GetGOT() == GO_Type::NobHarborbuilding || goal->GetGOT() == GO_Type::NobStorehouse
-                    || goal->GetGOT() == GO_Type::NobHq)
-                return std::make_unique<nofPassiveWorker>(Job::Scout, pt, player, goal);
-            else if(goal->GetGOT() == GO_Type::NobUsual) // Spähturm / Lagerhaus?
+            // Different scout for lookout towers and free scouts
+            if(goal->GetGOT() == GO_Type::NobUsual)
             {
                 RTTR_Assert(dynamic_cast<nobUsual*>(goal));
                 return std::make_unique<nofScout_LookoutTower>(pt, player, static_cast<nobUsual*>(goal));
diff --git a/libs/s25main/figures/nofBuildingWorker.cpp b/libs/s25main/figures/nofBuildingWorker.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -25,11 +25,6 @@ nofBuildingWorker::nofBuildingWorker(const Job job, const MapPoint pos, const un
       workplace))); // Assume we have at least a GameObject and check if it is a valid workplace
 }
 
-nofBuildingWorker::nofBuildingWorker(const Job job, const MapPoint pos, const unsigned char player,
-                                     nobBaseWarehouse* goalWh)
-    : noFigure(job, pos, player, goalWh), state(State::FigureWork), workplace(nullptr), was_sounding(false)
-{}
-
 void nofBuildingWorker::Serialize(SerializedGameData& sgd) const
 {
     noFigure::Serialize(sgd);
diff --git a/libs/s25main/figures/nofBuildingWorker.h b/libs/s25main/figures/nofBuildingWorker.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2024 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -92,7 +92,6 @@ class nofBuildingWorker : public noFigure
     State GetState() const { return state; }
 
     nofBuildingWorker(Job job, MapPoint pos, unsigned char player, nobUsual* workplace);
-    nofBuildingWorker(Job job, MapPoint pos, unsigned char player, nobBaseWarehouse* goalWh);
     nofBuildingWorker(SerializedGameData& sgd, unsigned obj_id);
     nofBuildingWorker(const nofBuildingWorker&) = delete;
 
diff --git a/libs/s25main/figures/nofScout_LookoutTower.cpp b/libs/s25main/figures/nofScout_LookoutTower.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -15,10 +15,6 @@ nofScout_LookoutTower::nofScout_LookoutTower(const MapPoint pos, const unsigned
     : nofBuildingWorker(Job::Scout, pos, player, workplace)
 {}
 
-nofScout_LookoutTower::nofScout_LookoutTower(const MapPoint pos, const unsigned char player, nobBaseWarehouse* goalWh)
-    : nofBuildingWorker(Job::Scout, pos, player, goalWh)
-{}
-
 nofScout_LookoutTower::nofScout_LookoutTower(SerializedGameData& sgd, const unsigned obj_id)
     : nofBuildingWorker(sgd, obj_id)
 {}
diff --git a/libs/s25main/figures/nofScout_LookoutTower.h b/libs/s25main/figures/nofScout_LookoutTower.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -28,7 +28,6 @@ class nofScout_LookoutTower : public nofBuildingWorker
 
 public:
     nofScout_LookoutTower(MapPoint pos, unsigned char player, nobUsual* workplace);
-    nofScout_LookoutTower(MapPoint pos, unsigned char player, nobBaseWarehouse* goalWh);
     nofScout_LookoutTower(SerializedGameData& sgd, unsigned obj_id);
 
     GO_Type GetGOT() const final { return GO_Type::NofScoutLookouttower; }
diff --git a/libs/s25main/figures/nofWellguy.cpp b/libs/s25main/figures/nofWellguy.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -19,10 +19,6 @@ nofWellguy::nofWellguy(const MapPoint pos, const unsigned char player, nobUsual*
     : nofWorkman(Job::Helper, pos, player, workplace)
 {}
 
-nofWellguy::nofWellguy(const MapPoint pos, const unsigned char player, nobBaseWarehouse* goalWh)
-    : nofWorkman(Job::Helper, pos, player, goalWh)
-{}
-
 nofWellguy::nofWellguy(SerializedGameData& sgd, const unsigned obj_id) : nofWorkman(sgd, obj_id) {}
 
 void nofWellguy::DrawWorking(DrawPoint drawPt)
diff --git a/libs/s25main/figures/nofWellguy.h b/libs/s25main/figures/nofWellguy.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -26,10 +26,7 @@ class nofWellguy : public nofWorkman
     bool StartWorking() override;
 
 public:
-    /// Ctor for sending the figure to its workplace
     nofWellguy(MapPoint pos, unsigned char player, nobUsual* workplace);
-    /// Ctor for sending the figure to a warehouse (harbor, HQ,...)
-    nofWellguy(MapPoint pos, unsigned char player, nobBaseWarehouse* goalWh);
     nofWellguy(SerializedGameData& sgd, unsigned obj_id);
 
     GO_Type GetGOT() const final { return GO_Type::NofWellguy; }
diff --git a/libs/s25main/figures/nofWorkman.cpp b/libs/s25main/figures/nofWorkman.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -14,10 +14,6 @@ nofWorkman::nofWorkman(const Job job, const MapPoint pos, const unsigned char pl
     : nofBuildingWorker(job, pos, player, workplace)
 {}
 
-nofWorkman::nofWorkman(const Job job, const MapPoint pos, const unsigned char player, nobBaseWarehouse* goalWh)
-    : nofBuildingWorker(job, pos, player, goalWh)
-{}
-
 nofWorkman::nofWorkman(SerializedGameData& sgd, const unsigned obj_id) : nofBuildingWorker(sgd, obj_id) {}
 
 void nofWorkman::HandleDerivedEvent(const unsigned /*id*/)
diff --git a/libs/s25main/figures/nofWorkman.h b/libs/s25main/figures/nofWorkman.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -40,10 +40,7 @@ class nofWorkman : public nofBuildingWorker
     MapPoint FindPointWithResource(ResourceType type) const;
 
 public:
-    /// Going to workplace
     nofWorkman(Job job, MapPoint pos, unsigned char player, nobUsual* workplace);
-    /// Going to warehouse
-    nofWorkman(Job job, MapPoint pos, unsigned char player, nobBaseWarehouse* goalWh);
     nofWorkman(SerializedGameData& sgd, unsigned obj_id);
 
     void HandleDerivedEvent(unsigned id) override;
