bugfix(pathfinder): Fix some pinched cells being changed to impassable cells in internal_classifyObjectFootprint() (TheSuperHackers#2222)

Mauller · web-flow · commit b009261f3fbb · 2026-01-30T22:53:02.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -4093,6 +4093,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 		}
 	}
 
+#if RETAIL_COMPATIBLE_PATHFINDING
 	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
 	{
 		for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
@@ -4103,6 +4104,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 			}
 		}
 	}
+#endif
 
 	// Expand building bounds 1 cell.
 	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -4373,6 +4373,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 		}
 	}
 
+#if RETAIL_COMPATIBLE_PATHFINDING
 	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )
 	{
 		for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )
@@ -4383,6 +4384,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )
 			}
 		}
 	}
+#endif
 
 	// Expand building bounds 1 cell.
 	for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )

Original file line number	Diff line number	Diff line change
`@@ -4093,6 +4093,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )`
`4093`	`4093`	`}`
`4094`	`4094`	`}`
`4095`	`4095`
	`4096`	`+#if RETAIL_COMPATIBLE_PATHFINDING`
`4096`	`4097`	`for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )`
`4097`	`4098`	`{`
`4098`	`4099`	`for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )`
`@@ -4103,6 +4104,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )`
`4103`	`4104`	`}`
`4104`	`4105`	`}`
`4105`	`4106`	`}`
	`4107`	`+#endif`
`4106`	`4108`
`4107`	`4109`	`// Expand building bounds 1 cell.`
`4108`	`4110`	`for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )`
Original file line number	Diff line number	Diff line change
`@@ -4373,6 +4373,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )`
`4373`	`4373`	`}`
`4374`	`4374`	`}`
`4375`	`4375`
	`4376`	`+#if RETAIL_COMPATIBLE_PATHFINDING`
`4376`	`4377`	`for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )`
`4377`	`4378`	`{`
`4378`	`4379`	`for( i=cellBounds.lo.x; i<=cellBounds.hi.x; i++ )`
`@@ -4383,6 +4384,7 @@ void Pathfinder::internal_classifyObjectFootprint( Object *obj, Bool insert )`
`4383`	`4384`	`}`
`4384`	`4385`	`}`
`4385`	`4386`	`}`
	`4387`	`+#endif`
`4386`	`4388`
`4387`	`4389`	`// Expand building bounds 1 cell.`
`4388`	`4390`	`for( j=cellBounds.lo.y; j<=cellBounds.hi.y; j++ )`