Cancel leaving soldiers before requesting defender

Soldiers are stopped when a defender is coming out.
If no defender is found the leaving soldiers are checked.
So it is better to first stop the leaving soldiers and then choose from
all of them.

Also remove `nofAggressiveDefender::NeedForHomeDefence` which is a
wrapper to `InformTargetsAboutCancelling` only used in a single place
which is now redundant.

Author: Flamefire

libs/s25main/buildings/nobBaseMilitary.cpp

@@ -221,27 +221,22 @@ MapPoint nobBaseMilitary::FindAnAttackerPlace(unsigned short& ret_radius, const
 
 bool nobBaseMilitary::CallDefender(nofAttacker& attacker)
 {
+    // Block soldiers leaving this building e.g. for attacks or aggressive defending
+    StopLeavingSoldiers();
     // Use existing defender (e.g. just going back in) if possible
     if(defender_)
     {
         defender_->NewAttacker(attacker);
-        // Block soldiers leaving this building e.g. for attacks or aggressive defending
-        StopLeavingSoldiers();
-        return true;
-    } else
-    {
-        auto defender = ProvideDefender(attacker);
-        if(!defender)
-            return false; // Building empty -> Can be conquered
-
-        // Block soldiers leaving this building e.g. for attacks or aggressive defending
-        StopLeavingSoldiers();
-        // Soldat muss noch rauskommen
-        defender_ = defender.get();
-        AddLeavingFigure(std::move(defender));
-
         return true;
     }
+    auto defender = ProvideDefender(attacker);
+    if(!defender)
+        return false; // Building empty -> Can be conquered
+
+    // Soldat muss noch rauskommen
+    defender_ = defender.get();
+    AddLeavingFigure(std::move(defender));
+    return true;
 }
 
 nofAttacker* nobBaseMilitary::FindAttackerNearBuilding()

libs/s25main/buildings/nobBaseWarehouse.cpp

@@ -1098,28 +1098,22 @@ std::unique_ptr<nofDefender> nobBaseWarehouse::ProvideDefender(nofAttacker& atta
         }
     }
 
-    // Kein Soldat gefunden, als letzten Hoffnung die Soldaten nehmen, die ggf in der Warteschlange noch hängen
+    // If no soldier was found take a soldier that is about to leave (to another building)
     for(auto it = leave_house.begin(); it != leave_house.end(); ++it)
     {
-        std::unique_ptr<nofSoldier> soldier;
-        if((*it)->GetGOT() == GO_Type::NofAggressivedefender)
+        if((*it)->GetGOT() == GO_Type::NofPassivesoldier)
         {
-            soldier = boost::static_pointer_cast<nofSoldier>(std::move(*it));
-            static_cast<nofAggressiveDefender&>(*soldier).NeedForHomeDefence();
-        } else if((*it)->GetGOT() == GO_Type::NofPassivesoldier)
-            soldier = boost::static_pointer_cast<nofSoldier>(std::move(*it));
-        else
-            continue;
+            std::unique_ptr<nofSoldier> soldier = boost::static_pointer_cast<nofSoldier>(std::move(*it));
 
-        leave_house.erase(it); // Only allowed in the loop as we return now
-        soldier->Abrogate();
+            leave_house.erase(it); // Only allowed in the loop as we return now
+            soldier->Abrogate();
 
-        auto defender = std::make_unique<nofDefender>(pos, player, *this, soldier->GetRank(), attacker);
-        defender->SetArmor(soldier->HasArmor());
-        soldier->Destroy();
-        return defender;
+            auto defender = std::make_unique<nofDefender>(pos, player, *this, soldier->GetRank(), attacker);
+            defender->SetArmor(soldier->HasArmor());
+            soldier->Destroy();
+            return defender;
+        }
     }
-
     return nullptr;
 }
 

libs/s25main/buildings/nobMilitary.cpp

@@ -1013,14 +1013,7 @@ std::unique_ptr<nofDefender> nobMilitary::ProvideDefender(nofAttacker& attacker)
 {
     nofPassiveSoldier* soldier = ChooseSoldier();
     if(!soldier)
-    {
-        /// Soldaten, die noch auf Mission gehen wollen, canceln und für die Verteidigung mit einziehen
-        StopLeavingSoldiers();
-        // Nochmal versuchen
-        soldier = ChooseSoldier();
-        if(!soldier)
-            return nullptr;
-    }
+        return nullptr;
 
     auto defender = std::make_unique<nofDefender>(*soldier, attacker);
 

libs/s25main/figures/nofAggressiveDefender.cpp

@@ -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
 
@@ -251,11 +251,6 @@ void nofAggressiveDefender::AttackerLost()
     // TODO(Replay) When still in leave queue abort to avoid going out and right back
 }
 
-void nofAggressiveDefender::NeedForHomeDefence()
-{
-    InformTargetsAboutCancelling();
-}
-
 void nofAggressiveDefender::InformTargetsAboutCancelling()
 {
     nofActiveSoldier::InformTargetsAboutCancelling();

libs/s25main/figures/nofAggressiveDefender.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
 
@@ -69,9 +69,6 @@ class nofAggressiveDefender : public nofActiveSoldier
     void MissAggressiveDefendingContinueWalking();
     /// Wenn der jeweils andere Soldat, mit dem man kämpfen wollte, nicht mehr kommen kann
     void AttackerLost();
-    /// Ich befinde mich noch im Lagerhaus in der Warteschlange und muss mein HQ etc. verteidigen
-    /// Mission muss also abgebrochen werden
-    void NeedForHomeDefence();
 
     // Debugging
     const nofAttacker* GetAttacker() const { return attacker; }