Pass goal by reference as it is always non-NULL

Author: Flamefire

libs/s25main/GamePlayer.cpp

@@ -731,8 +731,7 @@ void GamePlayer::FindMaterialForBuildingSites()
 
 void GamePlayer::AddJobWanted(const Job job, noRoadNode* workplace)
 {
-    // Und gleich suchen
-    if(!FindWarehouseForJob(job, workplace))
+    if(!FindWarehouseForJob(job, *workplace))
     {
         JobNeeded jn = {job, workplace};
         jobs_wanted.push_back(jn);
@@ -803,9 +802,9 @@ void GamePlayer::ToolOrderProcessed(Tool tool)
     }
 }
 
-bool GamePlayer::FindWarehouseForJob(const Job job, noRoadNode* goal) const
+bool GamePlayer::FindWarehouseForJob(const Job job, noRoadNode& goal) const
 {
-    nobBaseWarehouse* wh = FindWarehouse(*goal, FW::HasFigure(job, true), false, false);
+    nobBaseWarehouse* wh = FindWarehouse(goal, FW::HasFigure(job, true), false, false);
 
     if(wh)
     {
@@ -821,7 +820,7 @@ void GamePlayer::FindWarehouseForAllJobs()
 {
     for(auto it = jobs_wanted.begin(); it != jobs_wanted.end();)
     {
-        if(FindWarehouseForJob(it->job, it->workplace))
+        if(FindWarehouseForJob(it->job, *it->workplace))
             it = jobs_wanted.erase(it);
         else
             ++it;
@@ -834,7 +833,7 @@ void GamePlayer::FindWarehouseForAllJobs(const Job job)
     {
         if(it->job == job)
         {
-            if(FindWarehouseForJob(it->job, it->workplace))
+            if(FindWarehouseForJob(it->job, *it->workplace))
                 it = jobs_wanted.erase(it);
             else
                 ++it;
@@ -1309,9 +1308,8 @@ void GamePlayer::CallFlagWorker(const MapPoint pt, const Job job)
     /// Find wh with given job type (e.g. geologist, scout, ...)
     nobBaseWarehouse* wh = FindWarehouse(*flag, FW::HasFigure(job, true), false, false);
 
-    /// Wenns eins gibt, dann rufen
     if(wh)
-        wh->OrderJob(job, flag, true);
+        wh->OrderJob(job, *flag, true);
 }
 
 bool GamePlayer::IsFlagWorker(const nofFlagWorker* flagworker)

libs/s25main/GamePlayer.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
 
@@ -427,7 +427,7 @@ class GamePlayer : public GamePlayerInfo
     /// Called after a pact was changed(added/removed) in both players
     void PactChanged(PactType pt);
     // Sucht Weg für Job zu entsprechenden noRoadNode
-    bool FindWarehouseForJob(Job job, noRoadNode* goal) const;
+    bool FindWarehouseForJob(Job job, noRoadNode& goal) const;
     /// Prüft, ob der Spieler besiegt wurde
     void TestDefeat();
     nobHQ* GetHQ() const;

libs/s25main/buildings/nobBaseWarehouse.cpp

@@ -233,23 +233,22 @@ void nobBaseWarehouse::OrderCarrier(noRoadNode& goal, RoadSegment& workplace)
     TryStopRecruiting();
 }
 
-bool nobBaseWarehouse::OrderJob(const Job job, noRoadNode* const goal, const bool allow_recruiting)
+bool nobBaseWarehouse::OrderJob(const Job job, noRoadNode& goal, const bool allow_recruiting)
 {
-    RTTR_Assert(goal);
     // Maybe we have to recruit one
     if(!inventory[job])
     {
         if(!allow_recruiting || !TryRecruitJob(job))
             return false;
     }
 
-    std::unique_ptr<noFigure> fig = JobFactory::CreateJob(job, pos, player, *goal);
+    std::unique_ptr<noFigure> fig = JobFactory::CreateJob(job, pos, player, goal);
     // Ziel Bescheid sagen, dass dortin ein neuer Arbeiter kommt (bei Flaggen als das anders machen)
-    if(goal->GetType() != NodalObjectType::Flag)
-        checkedCast<noBaseBuilding*>(goal)->GotWorker(job, *fig);
+    if(goal.GetType() != NodalObjectType::Flag)
+        checkedCast<noBaseBuilding>(goal).GotWorker(job, *fig);
 
     // Wenn Figur nicht sofort von abgeleiteter Klasse verwenet wird, fügen wir die zur Leave-Liste hinzu
-    if(!UseFigureAtOnce(fig, *goal))
+    if(!UseFigureAtOnce(fig, goal))
         AddLeavingFigure(std::move(fig));
 
     inventory.real.Remove(job);
@@ -351,7 +350,7 @@ void nobBaseWarehouse::HandleCollectEvent()
             if(wh)
             {
                 // Dann bestellen
-                if(wh->OrderJob(i, this, false))
+                if(wh->OrderJob(i, *this, false))
                     break;
             }
         }

libs/s25main/buildings/nobBaseWarehouse.h

@@ -180,7 +180,7 @@ class nobBaseWarehouse : public nobBaseMilitary, public DataChangedObservable
     /// Bestellt einen Träger
     void OrderCarrier(noRoadNode& goal, RoadSegment& workplace);
     /// Bestellt irgendeinen Beruf (ggf. stellt er ihn noch mit einem Werkzeug her)
-    bool OrderJob(Job job, noRoadNode* goal, bool allow_recruiting);
+    bool OrderJob(Job job, noRoadNode& goal, bool allow_recruiting);
     /// Bestellt einen Esel
     nofCarrier* OrderDonkey(RoadSegment* road, noRoadNode* goal_flag);
     /// "Bestellt" eine Ware --> gibt den Pointer auf die Ware zurück

tests/s25Main/integration/testBaseWarehouse.cpp

@@ -143,22 +143,22 @@ BOOST_FIXTURE_TEST_CASE(OrderJob, EmptyWorldFixture1P)
     while(hq->GetNumRealFigures(Job::Builder) > 0u)
     {
         const auto numBuilders = hq->GetNumRealFigures(Job::Builder);
-        BOOST_TEST(hq->OrderJob(Job::Builder, wh, false));
+        BOOST_TEST(hq->OrderJob(Job::Builder, *wh, false));
         BOOST_TEST_REQUIRE(hq->GetNumRealFigures(Job::Builder) == numBuilders - 1u);
     }
     // Ordering another one fails
-    BOOST_TEST_REQUIRE(!hq->OrderJob(Job::Builder, wh, false));
+    BOOST_TEST_REQUIRE(!hq->OrderJob(Job::Builder, *wh, false));
     BOOST_TEST_REQUIRE(hq->GetNumRealFigures(Job::Builder) == 0u);
     // Recruit all possible builders
     while(hq->GetNumRealWares(GoodType::Hammer) > 0u)
     {
         const auto numHammers = hq->GetNumRealWares(GoodType::Hammer);
-        BOOST_TEST(hq->OrderJob(Job::Builder, wh, true));
+        BOOST_TEST(hq->OrderJob(Job::Builder, *wh, true));
         BOOST_TEST_REQUIRE(hq->GetNumRealWares(GoodType::Hammer) == numHammers - 1u);
         BOOST_TEST_REQUIRE(hq->GetNumRealFigures(Job::Builder) == 0u);
     }
     // Ordering another one fails
-    BOOST_TEST_REQUIRE(!hq->OrderJob(Job::Builder, wh, true));
+    BOOST_TEST_REQUIRE(!hq->OrderJob(Job::Builder, *wh, true));
     BOOST_TEST(hq->GetNumRealFigures(Job::Builder) == 0u);
     BOOST_TEST(hq->GetNumRealWares(GoodType::Hammer) == 0u);
 }
@@ -257,4 +257,4 @@ BOOST_FIXTURE_TEST_CASE(CollectGoodsAndFigures, WorldWithGCExecution1P)
         BOOST_TEST(wh2->GetNumVisualWares(good) == 1u);
         BOOST_TEST(wh2->GetNumRealWares(good) == 1u);
     }
-}
+}