fix: revert incorrect nullptr conversion for UnsignedInt bitfields m_open and m_closed

bobtista · bobtista · commit 80234be0e6f0 · 2025-12-14T18:21:12.000-05:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -1339,7 +1339,7 @@ void PathfindCell::releaseInfo(void)
 	}
 
 	DEBUG_ASSERTCRASH(m_info->m_prevOpen== nullptr && m_info->m_nextOpen==0, ("Shouldn't be linked."));
-	DEBUG_ASSERTCRASH(m_info->m_open== nullptr && m_info->m_closed==0, ("Shouldn't be linked."));
+	DEBUG_ASSERTCRASH(m_info->m_open==0 && m_info->m_closed==0, ("Shouldn't be linked."));
 	DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));
 	DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));
 	if (m_info->m_prevOpen || m_info->m_nextOpen || m_info->m_open || m_info->m_closed) {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -1354,7 +1354,7 @@ void PathfindCell::releaseInfo(void)
 	}
 
 	DEBUG_ASSERTCRASH(m_info->m_prevOpen== nullptr && m_info->m_nextOpen==0, ("Shouldn't be linked."));
-	DEBUG_ASSERTCRASH(m_info->m_open== nullptr && m_info->m_closed==0, ("Shouldn't be linked."));
+	DEBUG_ASSERTCRASH(m_info->m_open==0 && m_info->m_closed==0, ("Shouldn't be linked."));
 	DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));
 	DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));
 	if (m_info->m_prevOpen || m_info->m_nextOpen || m_info->m_open || m_info->m_closed) {

Original file line number	Diff line number	Diff line change
`@@ -1339,7 +1339,7 @@ void PathfindCell::releaseInfo(void)`
`1339`	`1339`	`}`
`1340`	`1340`
`1341`	`1341`	`DEBUG_ASSERTCRASH(m_info->m_prevOpen== nullptr && m_info->m_nextOpen==0, ("Shouldn't be linked."));`
`1342`		`- DEBUG_ASSERTCRASH(m_info->m_open== nullptr && m_info->m_closed==0, ("Shouldn't be linked."));`
	`1342`	`+ DEBUG_ASSERTCRASH(m_info->m_open==0 && m_info->m_closed==0, ("Shouldn't be linked."));`
`1343`	`1343`	`DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));`
`1344`	`1344`	`DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));`
`1345`	`1345`	`if (m_info->m_prevOpen \|\| m_info->m_nextOpen \|\| m_info->m_open \|\| m_info->m_closed) {`
Original file line number	Diff line number	Diff line change
`@@ -1354,7 +1354,7 @@ void PathfindCell::releaseInfo(void)`
`1354`	`1354`	`}`
`1355`	`1355`
`1356`	`1356`	`DEBUG_ASSERTCRASH(m_info->m_prevOpen== nullptr && m_info->m_nextOpen==0, ("Shouldn't be linked."));`
`1357`		`- DEBUG_ASSERTCRASH(m_info->m_open== nullptr && m_info->m_closed==0, ("Shouldn't be linked."));`
	`1357`	`+ DEBUG_ASSERTCRASH(m_info->m_open==0 && m_info->m_closed==0, ("Shouldn't be linked."));`
`1358`	`1358`	`DEBUG_ASSERTCRASH(m_info->m_goalUnitID==INVALID_ID && m_info->m_posUnitID==INVALID_ID, ("Shouldn't be occupied."));`
`1359`	`1359`	`DEBUG_ASSERTCRASH(m_info->m_goalAircraftID==INVALID_ID , ("Shouldn't be occupied by aircraft."));`
`1360`	`1360`	`if (m_info->m_prevOpen \|\| m_info->m_nextOpen \|\| m_info->m_open \|\| m_info->m_closed) {`