Add isSoldierJob function

Unify uses of soldier checks in one place.

Author: Flamefire

libs/s25main/GamePlayer.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
 
@@ -434,7 +434,7 @@ void GamePlayer::AddBuilding(noBuilding* bld, BuildingType bldType)
 
     // Order a worker if needed
     const auto& description = BLD_WORK_DESC[bldType];
-    if(description.job && description.job != Job::Private)
+    if(description.job && !isSoldierJob(*description.job))
     {
         AddJobWanted(*description.job, bld);
     }

libs/s25main/buildings/nobBaseWarehouse.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
 
@@ -763,7 +763,7 @@ void nobBaseWarehouse::CheckJobsForNewFigure(const Job job)
     if(job == Job::Helper)
         TryRecruiting();
 
-    if(job >= Job::Private && job <= Job::General)
+    if(isSoldierJob(job))
     {
         // Reserve prüfen
         RefreshReserve(getSoldierRank(job));

libs/s25main/figures/noFigure.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
 
@@ -123,16 +123,7 @@ noFigure::noFigure(SerializedGameData& sgd, const unsigned obj_id)
 
 bool noFigure::IsSoldier() const
 {
-    switch(job_)
-    {
-        case Job::Private:
-        case Job::PrivateFirstClass:
-        case Job::Sergeant:
-        case Job::Officer:
-        case Job::General: return true;
-        default: break;
-    }
-    return false;
+    return isSoldierJob(job_);
 }
 
 void noFigure::ActAtFirst()

libs/s25main/gameTypes/JobTypes.h

@@ -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
 
@@ -52,10 +52,15 @@ constexpr auto maxEnumValue(Job)
     return Job::TempleServant;
 }
 
-constexpr unsigned NUM_SOLDIER_RANKS = 5;
 /// Job types of soldiers, weak ones first
-static const std::array<Job, NUM_SOLDIER_RANKS> SUPPRESS_UNUSED SOLDIER_JOBS = {
-  {Job::Private, Job::PrivateFirstClass, Job::Sergeant, Job::Officer, Job::General}};
+constexpr std::array SUPPRESS_UNUSED SOLDIER_JOBS = {Job::Private, Job::PrivateFirstClass, Job::Sergeant, Job::Officer,
+                                                     Job::General};
+constexpr bool isSoldierJob(const Job job)
+{
+    return job >= Job::Private && job <= Job::General;
+}
+
+constexpr unsigned NUM_SOLDIER_RANKS = SOLDIER_JOBS.size();
 constexpr unsigned getSoldierRank(Job soldierJob)
 {
     return static_cast<uint8_t>(soldierJob) - static_cast<uint8_t>(Job::Private);