Use has_value instead of nullopt comparison

Flamefire · Flow86 · commit 83791d4ff67d · 2026-06-25T15:15:20.000+02:00
diff --git a/libs/s25main/figures/nofHunter.cpp b/libs/s25main/figures/nofHunter.cpp
@@ -211,7 +211,7 @@ void nofHunter::WalkedDerived()
 bool nofHunter::IsShootingPointGood(const MapPoint pt)
 {
     // Punkt muss betretbar sein und man muss ihn erreichen können
-    return PathConditionHuman(*world).IsNodeOk(pt) && world->FindHumanPath(this->pos, pt, 6) != std::nullopt;
+    return PathConditionHuman(*world).IsNodeOk(pt) && world->FindHumanPath(this->pos, pt, 6).has_value();
 }
 
 void nofHunter::HandleStateChasing()
diff --git a/libs/s25main/world/GameWorld.cpp b/libs/s25main/world/GameWorld.cpp
@@ -994,7 +994,7 @@ bool GameWorld::ValidWaitingAroundBuildingPoint(const MapPoint pt, const MapPoin
             return false;
     }
     // object wall or impassable terrain increasing my path to target length to a higher value than the direct distance?
-    return FindHumanPath(pt, center, CalcDistance(pt, center)) != std::nullopt;
+    return FindHumanPath(pt, center, CalcDistance(pt, center)).has_value();
 }
 
 bool GameWorld::IsValidPointForFighting(MapPoint pt, const nofActiveSoldier& soldier,

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ void nofHunter::WalkedDerived()`
`211`	`211`	`bool nofHunter::IsShootingPointGood(const MapPoint pt)`
`212`	`212`	`{`
`213`	`213`	`// Punkt muss betretbar sein und man muss ihn erreichen können`
`214`		`- return PathConditionHuman(*world).IsNodeOk(pt) && world->FindHumanPath(this->pos, pt, 6) != std::nullopt;`
	`214`	`+ return PathConditionHuman(*world).IsNodeOk(pt) && world->FindHumanPath(this->pos, pt, 6).has_value();`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`void nofHunter::HandleStateChasing()`
Original file line number	Diff line number	Diff line change
`@@ -994,7 +994,7 @@ bool GameWorld::ValidWaitingAroundBuildingPoint(const MapPoint pt, const MapPoin`
`994`	`994`	`return false;`
`995`	`995`	`}`
`996`	`996`	`// object wall or impassable terrain increasing my path to target length to a higher value than the direct distance?`
`997`		`- return FindHumanPath(pt, center, CalcDistance(pt, center)) != std::nullopt;`
	`997`	`+ return FindHumanPath(pt, center, CalcDistance(pt, center)).has_value();`
`998`	`998`	`}`
`999`	`999`
`1000`	`1000`	`bool GameWorld::IsValidPointForFighting(MapPoint pt, const nofActiveSoldier& soldier,`