Fix check when stopping leaving soldiers

The check assumes only active soldiers start in "Job-state".
This state is set when a figure arrived at its goal, and immediately for
those not having a "fixed" goal, like attacking soldiers.
But it also applies to e.g. trade-donkeys.

So check for soldiers directly.
Also rename `NoDefender` to `ResetDefender` to clarify meaning and
remove the check for leaving defenders which cannot be met:
The method is called before the defender is called.

Author: Flamefire

libs/s25main/buildings/nobBaseMilitary.cpp

@@ -337,17 +337,17 @@ void nobBaseMilitary::StopLeavingSoldiers()
 {
     for(auto it = leave_house.begin(); it != leave_house.end();)
     {
-        // Just take soldiers (in Job state) and no normal defenders which should always come out
-        if((*it)->IsDoingJobWorks() && (*it)->GetGOT() != GO_Type::NofDefender)
+        // Only take active soldiers
+        if(!dynamic_cast<nofActiveSoldier*>(it->get()))
+            ++it;
+        else
         {
-            auto soldier = boost::dynamic_pointer_cast<nofActiveSoldier>(std::move(*it));
-            RTTR_Assert(soldier);
+            auto soldier = boost::static_pointer_cast<nofActiveSoldier>(std::move(*it));
             it = leave_house.erase(it);
             FigureLeft(*soldier);
 
             soldier->InformTargetsAboutCancelling();
             AddActiveSoldier(std::move(soldier));
-        } else
-            ++it;
+        }
     }
 }

libs/s25main/buildings/nobBaseMilitary.h

@@ -106,7 +106,7 @@ class nobBaseMilitary : public noBuilding
     /// zu kommen, diese Funktion sucht nach solchen Soldaten schickt einen ggf. zur Flagge, um anzugreifen
     void CheckArrestedAttackers();
     /// Der Verteidiger ist entweder tot oder wieder reingegegangen
-    void NoDefender() { defender_ = nullptr; }
+    void ResetDefender() { defender_ = nullptr; }
     /// Stop all soldiers going for an attack from leaving the house, i.e. put them from the queue back in
     void StopLeavingSoldiers();
 

libs/s25main/buildings/nobBaseWarehouse.cpp

@@ -1026,7 +1026,7 @@ void nobBaseWarehouse::AddActiveSoldier(std::unique_ptr<nofActiveSoldier> soldie
 
     // Returned home
     if(soldier.get() == defender_)
-        NoDefender();
+        ResetDefender();
     else
     {
         // Ggf. war er auf Mission

libs/s25main/buildings/nobMilitary.cpp

@@ -785,7 +785,7 @@ void nobMilitary::AddActiveSoldier(std::unique_ptr<nofActiveSoldier> soldier)
 
     // Returned home
     if(soldier.get() == defender_)
-        NoDefender();
+        ResetDefender();
     else if(helpers::contains(troops_on_mission, soldier.get()))
     {
         troops_on_mission.remove(soldier.get());

libs/s25main/figures/nofDefender.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
 
@@ -152,7 +152,7 @@ void nofDefender::LostFighting()
     // Notify building if it still exists
     if(building)
     {
-        building->NoDefender();
+        building->ResetDefender();
         // A military building potentially needs to get new soldiers if this wasn't the last one
         if(BuildingProperties::IsMilitary(building->GetBuildingType()))
         {

libs/s25main/figures/nofDefender.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
 
@@ -43,7 +43,7 @@ class nofDefender : public nofActiveSoldier
 
     GO_Type GetGOT() const final { return GO_Type::NofDefender; }
 
-    /// Inform that a new attacker arrived at the flag while we are going on such that we can come right back
+    /// Inform that a new attacker arrived at the flag while we are going in such that we can come right back
     void NewAttacker(nofAttacker& attacker) { this->attacker = &attacker; }
     /// The attacker won't come to the flag anymore
     void AttackerArrested();