Consolidate handling of adding/removing people from warehouse inventory

It combines handling of armor and boat carriers.

Author: Flamefire

libs/s25main/buildings/nobBaseWarehouse.cpp

@@ -676,15 +676,7 @@ void nobBaseWarehouse::FigureLeft(const noFigure& fig)
     // Adapt inventory for non-warehouse workers
     if(fig.MemberOfWarehouse())
         return;
-    if(fig.GetJobType() == Job::BoatCarrier)
-    {
-        // Remove helper and boat separately
-        inventory.visual.Remove(Job::Helper);
-        inventory.visual.Remove(GoodType::Boat);
-    } else
-        inventory.visual.Remove(fig.GetJobType());
-
-    RemoveArmoredFigurFromVisualInventory(fig);
+    RemoveFromVisualInventory(fig);
 
     if(fig.GetGOT() == GO_Type::NofTradedonkey)
     {
@@ -839,38 +831,9 @@ void nobBaseWarehouse::AddFigure(std::unique_ptr<noFigure> figure, const bool in
     // Warenhausarbeiter werden nicht gezählt!
     if(!figure->MemberOfWarehouse())
     {
-        // War das ein Boot-Träger?
-        if(figure->GetJobType() == Job::BoatCarrier)
-        {
-            if(increase_visual_counts)
-            {
-                inventory.Add(Job::Helper);
-                inventory.Add(GoodType::Boat);
-            } else
-            {
-                inventory.real.Add(Job::Helper);
-                inventory.real.Add(GoodType::Boat);
-            }
-        } else if(isSoldier(figure->GetJobType()))
-        {
-            if(increase_visual_counts)
-            {
-                inventory.Add(figure->GetJobType());
-                if(figure->HasArmor())
-                    inventory.Add(jobEnumToAmoredSoldierEnum(figure->GetJobType()));
-            } else
-            {
-                inventory.real.Add(figure->GetJobType());
-                if(figure->HasArmor())
-                    inventory.real.Add(jobEnumToAmoredSoldierEnum(figure->GetJobType()));
-            }
-        } else
-        {
-            if(increase_visual_counts)
-                inventory.Add(figure->GetJobType());
-            else
-                inventory.real.Add(figure->GetJobType());
-        }
+        AddToRealInventory(*figure);
+        if(increase_visual_counts)
+            AddToVisualInventory(*figure);
     }
 
     // Check if we were actually waiting for this figure or if it was just added (e.g. builder that constructed it) to
@@ -882,19 +845,45 @@ void nobBaseWarehouse::AddFigure(std::unique_ptr<noFigure> figure, const bool in
     GetEvMgr().AddToKillList(std::move(figure));
 }
 
-void nobBaseWarehouse::RemoveArmoredFigurFromVisualInventory(const noFigure& figure)
+void nobBaseWarehouse::RemoveFromVisualInventory(const noFigure& figure)
 {
-    if(isSoldier(figure.GetJobType()) && figure.HasArmor())
+    const auto job = figure.GetJobType();
+    if(job == Job::BoatCarrier)
     {
-        RTTR_Assert(inventory.visual[jobEnumToAmoredSoldierEnum(figure.GetJobType())] > 0);
-        inventory.visual.Remove(jobEnumToAmoredSoldierEnum(figure.GetJobType()));
+        // Remove helper and boat separately
+        inventory.visual.Remove(Job::Helper);
+        inventory.visual.Remove(GoodType::Boat);
+    } else
+    {
+        inventory.visual.Remove(job);
+        if(isSoldier(job) && figure.HasArmor())
+            inventory.visual.Remove(jobEnumToAmoredSoldierEnum(job));
     }
 }
 
-void nobBaseWarehouse::AddArmoredFigurToVisualInventory(const noFigure& figure)
+static void addToInventory(Inventory& inventory, const noFigure& figure)
+{
+    const auto job = figure.GetJobType();
+    if(job == Job::BoatCarrier)
+    {
+        inventory.Add(Job::Helper);
+        inventory.Add(GoodType::Boat);
+    } else
+    {
+        inventory.Add(job);
+        if(isSoldier(job) && figure.HasArmor())
+            inventory.Add(jobEnumToAmoredSoldierEnum(job));
+    }
+}
+
+void nobBaseWarehouse::AddToVisualInventory(const noFigure& figure)
+{
+    addToInventory(inventory.visual, figure);
+}
+
+void nobBaseWarehouse::AddToRealInventory(const noFigure& figure)
 {
-    if(isSoldier(figure.GetJobType()) && figure.HasArmor())
-        inventory.visual.Add(jobEnumToAmoredSoldierEnum(figure.GetJobType()));
+    addToInventory(inventory.real, figure);
 }
 
 void nobBaseWarehouse::FetchWare()

libs/s25main/buildings/nobBaseWarehouse.h

@@ -125,8 +125,9 @@ class nobBaseWarehouse : public nobBaseMilitary, public DataChangedObservable
     /// Recruts a worker of the given job if possible
     bool TryRecruitJob(Job job);
 
-    void RemoveArmoredFigurFromVisualInventory(const noFigure& figure);
-    void AddArmoredFigurToVisualInventory(const noFigure& figure);
+    void RemoveFromVisualInventory(const noFigure& figure);
+    void AddToVisualInventory(const noFigure& figure);
+    void AddToRealInventory(const noFigure& figure);
 
     nobBaseWarehouse(BuildingType type, MapPoint pos, unsigned char player, Nation nation);
     nobBaseWarehouse(SerializedGameData& sgd, unsigned obj_id);

libs/s25main/buildings/nobHarborBuilding.cpp

@@ -515,8 +515,7 @@ void nobHarborBuilding::ShipArrived(noShip& ship)
         {
             if(it->dest == ship_dest)
             {
-                inventory.visual.Remove(it->attacker->GetJobType());
-                RemoveArmoredFigurFromVisualInventory(*it->attacker);
+                RemoveFromVisualInventory(*it->attacker);
                 attackers.push_back(std::move(it->attacker));
                 it = soldiers_for_ships.erase(it);
             } else
@@ -589,15 +588,7 @@ void nobHarborBuilding::ShipArrived(noShip& ship)
                 if(it->dest == dest)
                 {
                     it->fig->StartShipJourney();
-                    if(it->fig->GetJobType() != Job::BoatCarrier)
-                    {
-                        inventory.visual.Remove(it->fig->GetJobType());
-                        RemoveArmoredFigurFromVisualInventory(*it->fig);
-                    } else
-                    {
-                        inventory.visual.Remove(Job::Helper);
-                        inventory.visual.Remove(GoodType::Boat);
-                    }
+                    RemoveFromVisualInventory(*it->fig);
                     figures.push_back(std::move(it->fig));
                     it = figures_for_ships.erase(it);
                 } else
@@ -867,16 +858,7 @@ std::vector<nobHarborBuilding::ShipConnection> nobHarborBuilding::GetShipConnect
 void nobHarborBuilding::AddFigureForShip(std::unique_ptr<noFigure> fig, MapPoint dest)
 {
     RTTR_Assert(!world->HasFigureAt(fig->GetPos(), *fig)); // Figure is in the harbor, so it cannot be outside
-    // Anzahl visuell erhöhen
-    if(fig->GetJobType() != Job::BoatCarrier)
-    {
-        inventory.visual.Add(fig->GetJobType());
-        AddArmoredFigurToVisualInventory(*fig);
-    } else
-    {
-        inventory.visual.Add(Job::Helper);
-        inventory.visual.Add(GoodType::Boat);
-    }
+    AddToVisualInventory(*fig);
     figures_for_ships.emplace_back(FigureForShip{std::move(fig), dest});
     OrderShip();
 }
@@ -1027,15 +1009,7 @@ bool nobHarborBuilding::UseFigureAtOnce(std::unique_ptr<noFigure>& fig, noRoadNo
     {
         // Reduce figure count because figures don't go through the house leaving process
         // And therefore the visual count reducement
-        if(fig->GetJobType() != Job::BoatCarrier)
-        {
-            inventory.visual.Remove(fig->GetJobType());
-            RemoveArmoredFigurFromVisualInventory(*fig);
-        } else
-        {
-            inventory.visual.Remove(Job::Helper);
-            inventory.visual.Remove(GoodType::Boat);
-        }
+        RemoveFromVisualInventory(*fig);
         // Dann fügen wir die mal bei uns hinzu
         AddFigureForShip(std::move(fig), next_harbor);
         return true;
@@ -1069,16 +1043,7 @@ void nobHarborBuilding::ReceiveGoodsFromShip(std::list<std::unique_ptr<noFigure>
 
             if(nextDir == RoadPathDirection::SouthEast)
             {
-                // Increase visual count
-                if(figure->GetJobType() == Job::BoatCarrier)
-                {
-                    inventory.visual.Add(Job::Helper);
-                    inventory.visual.Add(GoodType::Boat);
-                } else
-                {
-                    inventory.visual.Add(figure->GetJobType());
-                    AddArmoredFigurToVisualInventory(*figure);
-                }
+                AddToVisualInventory(*figure);
                 AddLeavingFigure(std::move(figure));
             } else if(nextDir == RoadPathDirection::Ship)
             {