Factor out check if a GOT is a storehouse/nobBaseWarehouse

Author: Flamefire

libs/s25main/Ware.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
 
@@ -164,9 +164,8 @@ void Ware::GoalDestroyed()
         RTTR_Assert(location);
         RTTR_Assert(location->GetPlayer() < MAX_PLAYERS);
 
-        // Wird sie gerade aus einem Lagerhaus rausgetragen?
-        if(location->GetGOT() == GO_Type::NobStorehouse || location->GetGOT() == GO_Type::NobHarborbuilding
-           || location->GetGOT() == GO_Type::NobHq)
+        // Currently carried out of a warehouse?
+        if(nobBaseWarehouse::isStorehouseGOT(location->GetGOT()))
         {
             if(location != goal)
             {
@@ -199,11 +198,10 @@ void Ware::GoalDestroyed()
             if(goal != location)
             {
                 // find a warehouse for us (if we are entering a warehouse already set this as new goal (should only
-                // happen if its a harbor for shipping as the building wasnt our goal))
-                if(location->GetGOT() == GO_Type::NobStorehouse || location->GetGOT() == GO_Type::NobHarborbuilding
-                   || location->GetGOT()
-                        == GO_Type::NobHq) // currently carried into a warehouse? -> add ware (pathfinding
-                                           // will not return this wh because of path lengths 0)
+                // happen if its a harbor for shipping as the building wasn't our goal))
+                if(nobBaseWarehouse::isStorehouseGOT(
+                     location->GetGOT())) // currently carried into a warehouse? -> add ware (pathfinding
+                                          // will not return this wh because of path lengths 0)
                 {
                     if(location->GetGOT() != GO_Type::NobHarborbuilding)
                         LOG.write("WARNING: Ware::GoalDestroyed() -- ware is currently being carried into warehouse or "

libs/s25main/buildings/nobBaseWarehouse.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
 
@@ -44,6 +44,12 @@ struct InventorySettings : GoodsAndPeopleArray<InventorySetting>
 /// Change events: 1=InventorySettings
 class nobBaseWarehouse : public nobBaseMilitary, public DataChangedObservable
 {
+public:
+    static constexpr bool isStorehouseGOT(const GO_Type got)
+    {
+        return got == GO_Type::NobStorehouse || got == GO_Type::NobHarborbuilding || got == GO_Type::NobHq;
+    }
+
 protected:
     // Liste von Waren, die noch rausgebracht werden müssen, was im Moment aber nicht möglich ist,
     // weil die Flagge voll ist vor dem Lagerhaus

libs/s25main/figures/noFigure.cpp

@@ -48,12 +48,8 @@ noFigure::noFigure(const Job job, const MapPoint pos, const unsigned char player
       rs_pos(0), rs_dir(false), on_ship(false), goal_(goal), waiting_for_free_node(false), wander_way(0),
       wander_tryings(0), flagPos_(MapPoint::Invalid()), flag_obj_id(0), burned_wh_id(0xFFFFFFFF), last_id(0xFFFFFFFF)
 {
-    // Haben wir ein Ziel?
-    // Gehen wir in ein Lagerhaus? Dann dürfen wir da nicht unsere Arbeit ausführen, sondern
-    // gehen quasi nach Hause von Anfang an aus
-    if(goal
-       && (goal->GetGOT() == GO_Type::NobHarborbuilding || goal->GetGOT() == GO_Type::NobStorehouse
-           || goal->GetGOT() == GO_Type::NobHq))
+    // If the goal is a storehouse we won't work there but go to the new home
+    if(goal && nobBaseWarehouse::isStorehouseGOT(goal->GetGOT()))
         fs = FigureState::GoHome;
 }
 
@@ -418,10 +414,7 @@ void noFigure::GoHome(noRoadNode* goal)
         // Wenn wir cur_rs == 0, dann hängen wir wahrscheinlich noch im Lagerhaus in der Warteschlange
         if(cur_rs == nullptr)
         {
-            RTTR_Assert(world->GetNO(pos)->GetGOT() == GO_Type::NobHq || //-V807
-                        world->GetNO(pos)->GetGOT() == GO_Type::NobStorehouse
-                        || world->GetNO(pos)->GetGOT() == GO_Type::NobHarborbuilding);
-
+            RTTR_Assert(nobBaseWarehouse::isStorehouseGOT(world->GetNO(pos)->GetGOT()));
             goal_ = nullptr;
             world->GetSpecObj<nobBaseWarehouse>(pos)->CancelFigure(this);
             return;

libs/s25main/ingameWindows/iwBaseWarehouse.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
 
@@ -80,11 +80,10 @@ iwBaseWarehouse::iwBaseWarehouse(GameWorldView& gwv, GameCommandFactory& gcFacto
 
     UpdateOverlays();
 
-    // Lagerhaus oder Hafengebäude?
-    if(wh->GetGOT() == GO_Type::NobStorehouse || wh->GetGOT() == GO_Type::NobHarborbuilding)
+    // Add demolish button if not HQ
+    if(wh->GetGOT() != GO_Type::NobHq)
     {
-        // Abbrennbutton hinzufügen
-        // "Blättern" in Bretter stauchen und verschieben
+        // Make paginate button smaller and move to make space for demolish button
         GetCtrl<ctrlButton>(ID_PAGINATE)->SetWidth(32);
         GetCtrl<ctrlButton>(ID_PAGINATE)->SetPos(DrawPoint(86, GetFullSize().y - 47));