Rename Soldier::building to Soldier::homeBld

Flamefire · Flamefire · commit 60542a487290 · 2026-04-19T19:44:34.000+02:00
diff --git a/libs/s25main/figures/nofActiveSoldier.cpp b/libs/s25main/figures/nofActiveSoldier.cpp
@@ -43,11 +43,11 @@ void nofActiveSoldier::GoalReached()
 {
     // We reached the military building
     // Add myself to the building
-    if(!building)
+    if(!homeBld)
     {
         RTTR_Assert(false);
-        building = world->GetSpecObj<nobMilitary>(this->GetPos());
-        if(building)
+        homeBld = world->GetSpecObj<nobMilitary>(this->GetPos());
+        if(homeBld)
             LOG.write("nofActiveSoldier::GoalRoached() - no valid 'building' but found one at soldier's position "
                       "(%i,%i) (gf: %u)\n")
               % pos.x % pos.y % GetEvMgr().GetCurrentGF();
@@ -59,7 +59,7 @@ void nofActiveSoldier::GoalReached()
             throw std::runtime_error("No building found for soldier");
         }
     }
-    building->AddActiveSoldier(world->RemoveFigure(pos, *this));
+    homeBld->AddActiveSoldier(world->RemoveFigure(pos, *this));
 }
 
 void nofActiveSoldier::ReturnHome()
@@ -71,7 +71,7 @@ void nofActiveSoldier::ReturnHome()
 void nofActiveSoldier::WalkingHome()
 {
     // Is our home military building destroyed?
-    if(!building)
+    if(!homeBld)
     {
         // Start wandering around
         state = SoldierState::FigureWork;
@@ -83,13 +83,13 @@ void nofActiveSoldier::WalkingHome()
 
     // Walking home to our military building
 
-    if(GetPos() == building->GetFlagPos())  // Are we already at the flag?
+    if(GetPos() == homeBld->GetFlagPos())   // Are we already at the flag?
         StartWalking(Direction::NorthWest); // Enter via the door
-    else if(GetPos() == building->GetPos()) // or are we at the building
-        building->AddActiveSoldier(world->RemoveFigure(pos, *this));
+    else if(GetPos() == homeBld->GetPos())  // or are we at the building
+        homeBld->AddActiveSoldier(world->RemoveFigure(pos, *this));
     else
     {
-        const auto dir = world->FindHumanPath(pos, building->GetFlagPos(), 100);
+        const auto dir = world->FindHumanPath(pos, homeBld->GetFlagPos(), 100);
 
         if(dir)
         {
diff --git a/libs/s25main/figures/nofActiveSoldier.h b/libs/s25main/figures/nofActiveSoldier.h
@@ -133,7 +133,7 @@ class nofActiveSoldier : public nofSoldier
     SoldierState GetState() const { return state; }
     /// Set the home (building) to nullptr
     /// e.g. after the soldier was removed from the homes list but it was not destroyed
-    void ResetHome() { building = nullptr; }
+    void ResetHome() { homeBld = nullptr; }
     void FightVsDefenderStarted() { state = SoldierState::AttackingFightingVsDefender; }
 
     // For debugging
diff --git a/libs/s25main/figures/nofAggressiveDefender.cpp b/libs/s25main/figures/nofAggressiveDefender.cpp
@@ -72,12 +72,12 @@ void nofAggressiveDefender::Walked()
 
 void nofAggressiveDefender::HomeDestroyed()
 {
-    building = nullptr;
+    homeBld = nullptr;
 }
 
 void nofAggressiveDefender::HomeDestroyedAtBegin()
 {
-    building = nullptr;
+    homeBld = nullptr;
 
     // angegriffenem Gebäude Bescheid sagen, dass wir doch nicht mehr kommen
     InformTargetsAboutCancelling();
@@ -105,7 +105,7 @@ void nofAggressiveDefender::WonFighting()
         IncreaseRank();
 
     // Ist evtl. unser Heimatgebäude zerstört?
-    if(!building)
+    if(!homeBld)
     {
         // Ziel Bescheid sagen
         InformTargetsAboutCancelling();
@@ -177,7 +177,7 @@ void nofAggressiveDefender::MissAggressiveDefendingContinueWalking()
 
 void nofAggressiveDefender::MissAggressiveDefendingWalk()
 {
-    if(!building)
+    if(!homeBld)
     {
         // Home destroyed so abort and wander around
         InformTargetsAboutCancelling();
diff --git a/libs/s25main/figures/nofAttacker.cpp b/libs/s25main/figures/nofAttacker.cpp
@@ -202,15 +202,15 @@ void nofAttacker::Walked()
                 {
                     RTTR_Assert(dynamic_cast<nobMilitary*>(attacked_goal));
                     // We will now have this building as the new home, so inform old home, hunting soldier and ship
-                    if(building)
-                        building->SoldierLost(this);
+                    if(homeBld)
+                        homeBld->SoldierLost(this);
                     CancelAtHuntingDefender();
                     if(ship_obj_id)
                         CancelAtShip();
                     // Store the goal in a temporary as attacked_goal will be reset
                     auto* goal = static_cast<nobMilitary*>(attacked_goal);
                     goal->Capture(player);
-                    building = attacked_goal;
+                    homeBld = attacked_goal;
                     attacked_goal->AddActiveSoldier(world->RemoveFigure(pos, *this));
                     RemoveFromAttackedGoal();
                     // This might call other capturers
@@ -292,7 +292,7 @@ void nofAttacker::HomeDestroyed()
         if(ship_obj_id)
             CancelAtShip();
 
-        building = nullptr;
+        homeBld = nullptr;
         state = SoldierState::FigureWork;
         StartWandering();
         Wander();
@@ -302,15 +302,15 @@ void nofAttacker::HomeDestroyed()
     } else
     {
         // If we were going back home, reset that goal
-        if(goal_ == building)
+        if(goal_ == homeBld)
             goal_ = nullptr;
-        building = nullptr;
+        homeBld = nullptr;
     }
 }
 
 void nofAttacker::HomeDestroyedAtBegin()
 {
-    building = nullptr;
+    homeBld = nullptr;
 
     // We are lost now and hence not targetable
     InformTargetsAboutCancelling();
@@ -327,7 +327,7 @@ void nofAttacker::WonFighting()
         IncreaseRank();
     // If our home was destroyed then we are lost
     // unless we are currently fighting at the flag so that building can become our new home
-    if(!building && state != SoldierState::AttackingFightingVsDefender)
+    if(!homeBld && state != SoldierState::AttackingFightingVsDefender)
     {
         // Lost -> Tell all dependents
         InformTargetsAboutCancelling();
@@ -397,7 +397,7 @@ void nofAttacker::ReturnHomeMissionAttacking()
 void nofAttacker::MissAttackingWalk()
 {
     // If our home is destroyed we are lost
-    if(!building)
+    if(!homeBld)
     {
         InformTargetsAboutCancelling();
         if(ship_obj_id)
@@ -581,7 +581,7 @@ void nofAttacker::AttackedGoalDestroyed()
         auto* harbor = world->GetSpecObj<nobHarborBuilding>(harborPos);
         RTTR_Assert(harbor);
         // go home
-        goal_ = building;
+        goal_ = homeBld;
         state = SoldierState::FigureWork;
         fs = FigureState::GotToGoal;
         harbor->CancelSeaAttacker(this);
@@ -655,12 +655,12 @@ void nofAttacker::CapturingWalking()
     if(pos == attacked_goal->GetPos())
     {
         // We switch buildings
-        if(building)
-            building->SoldierLost(this);
+        if(homeBld)
+            homeBld->SoldierLost(this);
         CancelAtHuntingDefender();
         if(ship_obj_id)
             CancelAtShip();
-        building = attacked_goal;
+        homeBld = attacked_goal;
         attacked_goal->AddActiveSoldier(world->RemoveFigure(pos, *this));
 
         // No longer attacking
@@ -687,7 +687,7 @@ void nofAttacker::CapturingWalking()
         StartWalking(Direction::NorthWest);
         RTTR_Assert(attacked_goal->GetPlayer() == player); // Assumed by the call below
         static_cast<nobMilitary*>(attacked_goal)->NeedOccupyingTroops();
-    } else if(!building)
+    } else if(!homeBld)
     {
         // If our home is destroyed we are lost and don't walk to the target (our new home if we were at least at the
         // flag already) Notify it, if it still exists (could be destroyed in the meantime too)
@@ -845,7 +845,7 @@ void nofAttacker::StartReturnViaShip(noShip& ship)
         InformTargetsAboutCancelling();
     }
 
-    goal_ = building;
+    goal_ = homeBld;
     state = SoldierState::FigureWork;
     fs = FigureState::GotToGoal;
     on_ship = true;
@@ -883,7 +883,7 @@ void nofAttacker::CancelAtHuntingDefender()
 
 void nofAttacker::HandleState_SeaAttack_ReturnToShip()
 {
-    if(!building)
+    if(!homeBld)
     {
         // Home destroyed -> start wandering
         state = SoldierState::FigureWork;
@@ -921,7 +921,7 @@ void nofAttacker::HandleState_SeaAttack_ReturnToShip()
             Wander();
 
             // Notify home and ship
-            building->SoldierLost(this);
+            homeBld->SoldierLost(this);
             CancelAtShip();
         }
     }
diff --git a/libs/s25main/figures/nofDefender.cpp b/libs/s25main/figures/nofDefender.cpp
@@ -51,7 +51,7 @@ void nofDefender::Walked()
             attacker->FightVsDefenderStarted();
             break;
         case SoldierState::DefendingWalkingFrom:
-            if(!building)
+            if(!homeBld)
             {
                 // Home destroyed -> Start wandering around
                 attacker = nullptr;
@@ -68,7 +68,7 @@ void nofDefender::Walked()
                     StartWalking(Direction::SouthEast);
                 } else
                 {
-                    nobBaseMilitary* bld = building;
+                    nobBaseMilitary* bld = homeBld;
                     RTTR_Assert(bld->GetDefender() == this); // I should be the defender
                     bld->AddActiveSoldier(world->RemoveFigure(pos, *this));
                     RTTR_Assert(!bld->GetDefender()); // No defender anymore
@@ -81,7 +81,7 @@ void nofDefender::Walked()
 
 void nofDefender::HomeDestroyed()
 {
-    building = nullptr;
+    homeBld = nullptr;
 
     switch(state)
     {
@@ -106,7 +106,7 @@ void nofDefender::HomeDestroyed()
 
 void nofDefender::HomeDestroyedAtBegin()
 {
-    building = nullptr;
+    homeBld = nullptr;
 
     state = SoldierState::FigureWork;
 
@@ -122,7 +122,7 @@ void nofDefender::WonFighting()
     // Attacker is dead
     attacker = nullptr;
 
-    if(!building)
+    if(!homeBld)
     {
         // Home destroyed so abort and wander around
         state = SoldierState::FigureWork;
@@ -132,7 +132,7 @@ void nofDefender::WonFighting()
         return;
     }
 
-    attacker = building->FindAttackerNearBuilding();
+    attacker = homeBld->FindAttackerNearBuilding();
     if(attacker)
     {
         // New attacker found so wait for him
@@ -150,23 +150,23 @@ void nofDefender::LostFighting()
     attacker = nullptr;
 
     // Notify building if it still exists
-    if(building)
+    if(homeBld)
     {
-        building->ResetDefender();
+        homeBld->ResetDefender();
         // A military building potentially needs to get new soldiers if this wasn't the last one
-        if(BuildingProperties::IsMilitary(building->GetBuildingType()))
+        if(BuildingProperties::IsMilitary(homeBld->GetBuildingType()))
         {
-            RTTR_Assert(dynamic_cast<nobBaseMilitary*>(building));
-            if(static_cast<nobMilitary*>(building)->GetNumTroops())
-                static_cast<nobMilitary*>(building)->RegulateTroops();
+            RTTR_Assert(dynamic_cast<nobBaseMilitary*>(homeBld));
+            if(static_cast<nobMilitary*>(homeBld)->GetNumTroops())
+                static_cast<nobMilitary*>(homeBld)->RegulateTroops();
         }
-        building = nullptr;
+        homeBld = nullptr;
     }
 }
 
 void nofDefender::AttackerArrested()
 {
-    attacker = building->FindAttackerNearBuilding();
+    attacker = homeBld->FindAttackerNearBuilding();
     if(!attacker)
     {
         // Go back into the building
diff --git a/libs/s25main/figures/nofPassiveSoldier.cpp b/libs/s25main/figures/nofPassiveSoldier.cpp
@@ -97,24 +97,24 @@ void nofPassiveSoldier::Heal()
 
 void nofPassiveSoldier::GoalReached()
 {
-    static_cast<nobMilitary*>(building)->AddPassiveSoldier(world->RemoveFigure(pos, *this));
+    static_cast<nobMilitary*>(homeBld)->AddPassiveSoldier(world->RemoveFigure(pos, *this));
 }
 
 void nofPassiveSoldier::LeaveBuilding()
 {
     // Nach Hause in ein Lagerhaus gehen
     rs_dir = true;
     rs_pos = 1;
-    cur_rs = building->GetRoute(Direction::SouthEast);
+    cur_rs = homeBld->GetRoute(Direction::SouthEast);
     GoHome();
 
-    building = nullptr;
+    homeBld = nullptr;
 }
 
 void nofPassiveSoldier::Upgrade()
 {
     // We must not be in the buildings list while upgrading. This would destroy the ordered list
-    RTTR_Assert(!building || !static_cast<nobMilitary*>(building)->IsInTroops(*this));
+    RTTR_Assert(!homeBld || !static_cast<nobMilitary*>(homeBld)->IsInTroops(*this));
     // Einen Rang höher
     job_ = Job(unsigned(job_) + 1);
 
@@ -139,11 +139,11 @@ void nofPassiveSoldier::Walked()
 
 void nofPassiveSoldier::NotNeeded()
 {
-    building = nullptr;
+    homeBld = nullptr;
     GoHome();
 }
 
 nobMilitary* nofPassiveSoldier::getHome() const
 {
-    return checkedCast<nobMilitary*>(building);
+    return checkedCast<nobMilitary*>(homeBld);
 }
diff --git a/libs/s25main/figures/nofPassiveSoldier.h b/libs/s25main/figures/nofPassiveSoldier.h
@@ -53,6 +53,6 @@ class nofPassiveSoldier : public nofSoldier
     /// Soldat befindet sich auf dem Hinweg zum Militärgebäude und wird nich länger gebraucht
     void NotNeeded();
     /// Tells the soldier it is not in its home building anymore (e.g. died, or converted to attacker)
-    void LeftBuilding() { building = nullptr; }
+    void LeftBuilding() { homeBld = nullptr; }
     nobMilitary* getHome() const;
 };
diff --git a/libs/s25main/figures/nofSoldier.cpp b/libs/s25main/figures/nofSoldier.cpp
diff --git a/libs/s25main/figures/nofSoldier.h b/libs/s25main/figures/nofSoldier.h

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ void nofActiveSoldier::GoalReached()`
`43`	`43`	`{`
`44`	`44`	`// We reached the military building`
`45`	`45`	`// Add myself to the building`
`46`		`- if(!building)`
	`46`	`+ if(!homeBld)`
`47`	`47`	`{`
`48`	`48`	`RTTR_Assert(false);`
`49`		`- building = world->GetSpecObj<nobMilitary>(this->GetPos());`
`50`		`- if(building)`
	`49`	`+ homeBld = world->GetSpecObj<nobMilitary>(this->GetPos());`
	`50`	`+ if(homeBld)`
`51`	`51`	`LOG.write("nofActiveSoldier::GoalRoached() - no valid 'building' but found one at soldier's position "`
`52`	`52`	`"(%i,%i) (gf: %u)\n")`
`53`	`53`	`% pos.x % pos.y % GetEvMgr().GetCurrentGF();`
`@@ -59,7 +59,7 @@ void nofActiveSoldier::GoalReached()`
`59`	`59`	`throw std::runtime_error("No building found for soldier");`
`60`	`60`	`}`
`61`	`61`	`}`
`62`		`- building->AddActiveSoldier(world->RemoveFigure(pos, *this));`
	`62`	`+ homeBld->AddActiveSoldier(world->RemoveFigure(pos, *this));`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`void nofActiveSoldier::ReturnHome()`
`@@ -71,7 +71,7 @@ void nofActiveSoldier::ReturnHome()`
`71`	`71`	`void nofActiveSoldier::WalkingHome()`
`72`	`72`	`{`
`73`	`73`	`// Is our home military building destroyed?`
`74`		`- if(!building)`
	`74`	`+ if(!homeBld)`
`75`	`75`	`{`
`76`	`76`	`// Start wandering around`
`77`	`77`	`state = SoldierState::FigureWork;`
`@@ -83,13 +83,13 @@ void nofActiveSoldier::WalkingHome()`
`83`	`83`
`84`	`84`	`// Walking home to our military building`
`85`	`85`
`86`		`- if(GetPos() == building->GetFlagPos()) // Are we already at the flag?`
	`86`	`+ if(GetPos() == homeBld->GetFlagPos()) // Are we already at the flag?`
`87`	`87`	`StartWalking(Direction::NorthWest); // Enter via the door`
`88`		`- else if(GetPos() == building->GetPos()) // or are we at the building`
`89`		`- building->AddActiveSoldier(world->RemoveFigure(pos, *this));`
	`88`	`+ else if(GetPos() == homeBld->GetPos()) // or are we at the building`
	`89`	`+ homeBld->AddActiveSoldier(world->RemoveFigure(pos, *this));`
`90`	`90`	`else`
`91`	`91`	`{`
`92`		`- const auto dir = world->FindHumanPath(pos, building->GetFlagPos(), 100);`
	`92`	`+ const auto dir = world->FindHumanPath(pos, homeBld->GetFlagPos(), 100);`
`93`	`93`
`94`	`94`	`if(dir)`
`95`	`95`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,12 @@ void nofAggressiveDefender::Walked()`
`72`	`72`
`73`	`73`	`void nofAggressiveDefender::HomeDestroyed()`
`74`	`74`	`{`
`75`		`- building = nullptr;`
	`75`	`+ homeBld = nullptr;`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`void nofAggressiveDefender::HomeDestroyedAtBegin()`
`79`	`79`	`{`
`80`		`- building = nullptr;`
	`80`	`+ homeBld = nullptr;`
`81`	`81`
`82`	`82`	`// angegriffenem Gebäude Bescheid sagen, dass wir doch nicht mehr kommen`
`83`	`83`	`InformTargetsAboutCancelling();`
`@@ -105,7 +105,7 @@ void nofAggressiveDefender::WonFighting()`
`105`	`105`	`IncreaseRank();`
`106`	`106`
`107`	`107`	`// Ist evtl. unser Heimatgebäude zerstört?`
`108`		`- if(!building)`
	`108`	`+ if(!homeBld)`
`109`	`109`	`{`
`110`	`110`	`// Ziel Bescheid sagen`
`111`	`111`	`InformTargetsAboutCancelling();`
`@@ -177,7 +177,7 @@ void nofAggressiveDefender::MissAggressiveDefendingContinueWalking()`
`177`	`177`
`178`	`178`	`void nofAggressiveDefender::MissAggressiveDefendingWalk()`
`179`	`179`	`{`
`180`		`- if(!building)`
	`180`	`+ if(!homeBld)`
`181`	`181`	`{`
`182`	`182`	`// Home destroyed so abort and wander around`
`183`	`183`	`InformTargetsAboutCancelling();`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ void nofDefender::Walked()`
`51`	`51`	`attacker->FightVsDefenderStarted();`
`52`	`52`	`break;`
`53`	`53`	`case SoldierState::DefendingWalkingFrom:`
`54`		`- if(!building)`
	`54`	`+ if(!homeBld)`
`55`	`55`	`{`
`56`	`56`	`// Home destroyed -> Start wandering around`
`57`	`57`	`attacker = nullptr;`
`@@ -68,7 +68,7 @@ void nofDefender::Walked()`
`68`	`68`	`StartWalking(Direction::SouthEast);`
`69`	`69`	`} else`
`70`	`70`	`{`
`71`		`- nobBaseMilitary* bld = building;`
	`71`	`+ nobBaseMilitary* bld = homeBld;`
`72`	`72`	`RTTR_Assert(bld->GetDefender() == this); // I should be the defender`
`73`	`73`	`bld->AddActiveSoldier(world->RemoveFigure(pos, *this));`
`74`	`74`	`RTTR_Assert(!bld->GetDefender()); // No defender anymore`
`@@ -81,7 +81,7 @@ void nofDefender::Walked()`
`81`	`81`
`82`	`82`	`void nofDefender::HomeDestroyed()`
`83`	`83`	`{`
`84`		`- building = nullptr;`
	`84`	`+ homeBld = nullptr;`
`85`	`85`
`86`	`86`	`switch(state)`
`87`	`87`	`{`
`@@ -106,7 +106,7 @@ void nofDefender::HomeDestroyed()`
`106`	`106`
`107`	`107`	`void nofDefender::HomeDestroyedAtBegin()`
`108`	`108`	`{`
`109`		`- building = nullptr;`
	`109`	`+ homeBld = nullptr;`
`110`	`110`
`111`	`111`	`state = SoldierState::FigureWork;`
`112`	`112`
`@@ -122,7 +122,7 @@ void nofDefender::WonFighting()`
`122`	`122`	`// Attacker is dead`
`123`	`123`	`attacker = nullptr;`
`124`	`124`
`125`		`- if(!building)`
	`125`	`+ if(!homeBld)`
`126`	`126`	`{`
`127`	`127`	`// Home destroyed so abort and wander around`
`128`	`128`	`state = SoldierState::FigureWork;`
`@@ -132,7 +132,7 @@ void nofDefender::WonFighting()`
`132`	`132`	`return;`
`133`	`133`	`}`
`134`	`134`
`135`		`- attacker = building->FindAttackerNearBuilding();`
	`135`	`+ attacker = homeBld->FindAttackerNearBuilding();`
`136`	`136`	`if(attacker)`
`137`	`137`	`{`
`138`	`138`	`// New attacker found so wait for him`
`@@ -150,23 +150,23 @@ void nofDefender::LostFighting()`
`150`	`150`	`attacker = nullptr;`
`151`	`151`
`152`	`152`	`// Notify building if it still exists`
`153`		`- if(building)`
	`153`	`+ if(homeBld)`
`154`	`154`	`{`
`155`		`- building->ResetDefender();`
	`155`	`+ homeBld->ResetDefender();`
`156`	`156`	`// A military building potentially needs to get new soldiers if this wasn't the last one`
`157`		`- if(BuildingProperties::IsMilitary(building->GetBuildingType()))`
	`157`	`+ if(BuildingProperties::IsMilitary(homeBld->GetBuildingType()))`
`158`	`158`	`{`
`159`		`- RTTR_Assert(dynamic_cast<nobBaseMilitary*>(building));`
`160`		`- if(static_cast<nobMilitary*>(building)->GetNumTroops())`
`161`		`- static_cast<nobMilitary*>(building)->RegulateTroops();`
	`159`	`+ RTTR_Assert(dynamic_cast<nobBaseMilitary*>(homeBld));`
	`160`	`+ if(static_cast<nobMilitary*>(homeBld)->GetNumTroops())`
	`161`	`+ static_cast<nobMilitary*>(homeBld)->RegulateTroops();`
`162`	`162`	`}`
`163`		`- building = nullptr;`
	`163`	`+ homeBld = nullptr;`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`void nofDefender::AttackerArrested()`
`168`	`168`	`{`
`169`		`- attacker = building->FindAttackerNearBuilding();`
	`169`	`+ attacker = homeBld->FindAttackerNearBuilding();`
`170`	`170`	`if(!attacker)`
`171`	`171`	`{`
`172`	`172`	`// Go back into the building`
Original file line number	Diff line number	Diff line change
`@@ -97,24 +97,24 @@ void nofPassiveSoldier::Heal()`
`97`	`97`
`98`	`98`	`void nofPassiveSoldier::GoalReached()`
`99`	`99`	`{`
`100`		`- static_cast<nobMilitary>(building)->AddPassiveSoldier(world->RemoveFigure(pos, this));`
	`100`	`+ static_cast<nobMilitary>(homeBld)->AddPassiveSoldier(world->RemoveFigure(pos, this));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`void nofPassiveSoldier::LeaveBuilding()`
`104`	`104`	`{`
`105`	`105`	`// Nach Hause in ein Lagerhaus gehen`
`106`	`106`	`rs_dir = true;`
`107`	`107`	`rs_pos = 1;`
`108`		`- cur_rs = building->GetRoute(Direction::SouthEast);`
	`108`	`+ cur_rs = homeBld->GetRoute(Direction::SouthEast);`
`109`	`109`	`GoHome();`
`110`	`110`
`111`		`- building = nullptr;`
	`111`	`+ homeBld = nullptr;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`void nofPassiveSoldier::Upgrade()`
`115`	`115`	`{`
`116`	`116`	`// We must not be in the buildings list while upgrading. This would destroy the ordered list`
`117`		`- RTTR_Assert(!building \|\| !static_cast<nobMilitary>(building)->IsInTroops(this));`
	`117`	`+ RTTR_Assert(!homeBld \|\| !static_cast<nobMilitary>(homeBld)->IsInTroops(this));`
`118`	`118`	`// Einen Rang höher`
`119`	`119`	`job_ = Job(unsigned(job_) + 1);`
`120`	`120`
`@@ -139,11 +139,11 @@ void nofPassiveSoldier::Walked()`
`139`	`139`
`140`	`140`	`void nofPassiveSoldier::NotNeeded()`
`141`	`141`	`{`
`142`		`- building = nullptr;`
	`142`	`+ homeBld = nullptr;`
`143`	`143`	`GoHome();`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`nobMilitary* nofPassiveSoldier::getHome() const`
`147`	`147`	`{`
`148`		`- return checkedCast<nobMilitary*>(building);`
	`148`	`+ return checkedCast<nobMilitary*>(homeBld);`
`149`	`149`	`}`