refactor: Simplify min frames assignment

Stubbjax · Stubbjax · commit 5532443e9265 · 2025-09-26T19:38:29.000+10:00
diff --git a/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp b/Generals/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
@@ -323,7 +323,7 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 
 void TunnelTracker::updateFullHealTime()
 {
-	UnsignedInt minFrames = 0;
+	UnsignedInt minFrames = ~0u;
 
 	for (std::list<ObjectID>::const_iterator it = m_tunnelIDs.begin(); it != m_tunnelIDs.end(); ++it)
 	{
@@ -337,7 +337,7 @@ void TunnelTracker::updateFullHealTime()
 			continue;
 
 		const UnsignedInt framesForFullHeal = tunnelContain->getFullTimeForHeal();
-		if (minFrames == 0 || framesForFullHeal < minFrames)
+		if (framesForFullHeal < minFrames)
 			minFrames = framesForFullHeal;
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/TunnelTracker.cpp
@@ -324,7 +324,7 @@ void TunnelTracker::healObject( Object *obj, void *frames)
 
 void TunnelTracker::updateFullHealTime()
 {
-	UnsignedInt minFrames = 0;
+	UnsignedInt minFrames = ~0u;
 
 	for (std::list<ObjectID>::const_iterator it = m_tunnelIDs.begin(); it != m_tunnelIDs.end(); ++it)
 	{
@@ -338,7 +338,7 @@ void TunnelTracker::updateFullHealTime()
 			continue;
 
 		const UnsignedInt framesForFullHeal = tunnelContain->getFullTimeForHeal();
-		if (minFrames == 0 || framesForFullHeal < minFrames)
+		if (framesForFullHeal < minFrames)
 			minFrames = framesForFullHeal;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ void TunnelTracker::healObject( Object obj, void frames)`
`323`	`323`
`324`	`324`	`void TunnelTracker::updateFullHealTime()`
`325`	`325`	`{`
`326`		`- UnsignedInt minFrames = 0;`
	`326`	`+ UnsignedInt minFrames = ~0u;`
`327`	`327`
`328`	`328`	`for (std::list<ObjectID>::const_iterator it = m_tunnelIDs.begin(); it != m_tunnelIDs.end(); ++it)`
`329`	`329`	`{`
`@@ -337,7 +337,7 @@ void TunnelTracker::updateFullHealTime()`
`337`	`337`	`continue;`
`338`	`338`
`339`	`339`	`const UnsignedInt framesForFullHeal = tunnelContain->getFullTimeForHeal();`
`340`		`- if (minFrames == 0 \|\| framesForFullHeal < minFrames)`
	`340`	`+ if (framesForFullHeal < minFrames)`
`341`	`341`	`minFrames = framesForFullHeal;`
`342`	`342`	`}`
`343`	`343`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ void TunnelTracker::healObject( Object obj, void frames)`
`324`	`324`
`325`	`325`	`void TunnelTracker::updateFullHealTime()`
`326`	`326`	`{`
`327`		`- UnsignedInt minFrames = 0;`
	`327`	`+ UnsignedInt minFrames = ~0u;`
`328`	`328`
`329`	`329`	`for (std::list<ObjectID>::const_iterator it = m_tunnelIDs.begin(); it != m_tunnelIDs.end(); ++it)`
`330`	`330`	`{`
`@@ -338,7 +338,7 @@ void TunnelTracker::updateFullHealTime()`
`338`	`338`	`continue;`
`339`	`339`
`340`	`340`	`const UnsignedInt framesForFullHeal = tunnelContain->getFullTimeForHeal();`
`341`		`- if (minFrames == 0 \|\| framesForFullHeal < minFrames)`
	`341`	`+ if (framesForFullHeal < minFrames)`
`342`	`342`	`minFrames = framesForFullHeal;`
`343`	`343`	`}`
`344`	`344`