refactor(pathfinder): Remove unused function Pathfinder::pathDestination() (TheSuperHackers#2308)

Author: Caball009

Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h

@@ -790,9 +790,6 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 										Bool centerInCell, Int radius, const ICoord2D &startCellNdx,
 										const Object *obj, Int attackDistance);
 
- 	Bool pathDestination( Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
-		PathfindLayerEnum layer, const Coord3D *groupDest);	///< Checks cost between given locations
-
 	Int checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *to);
 

Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

@@ -7720,260 +7720,6 @@ void Pathfinder::clip( Coord3D *from, Coord3D *to )
 
 }
 
-Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
-		PathfindLayerEnum layer, const Coord3D *groupDest)
-{
-	//CRCDEBUG_LOG(("Pathfinder::pathDestination()"));
-	if (m_isMapReady == false) return false;
-
-	if (!obj) return false;
-
-	Int cellCount = 0;
-
-	Coord3D adjustTo = *groupDest;
-	Coord3D *to = &adjustTo;
-	DEBUG_ASSERTCRASH(m_openList.empty() && m_closedList.empty(), ("Dangling lists."));
-	// create unique "mark" values for open and closed cells for this pathfind invocation
-
-	Bool isCrusher = obj ? obj->getCrusherLevel() > 0 : false;
-
-	PathfindLayerEnum desiredLayer = TheTerrainLogic->getLayerForDestination(dest);
-	// determine desired
-	PathfindCell *desiredCell = getClippedCell( desiredLayer,  dest );
-	if (desiredCell == nullptr)
-		return FALSE;
-
-	PathfindLayerEnum goalLayer = TheTerrainLogic->getLayerForDestination(to);
-	// determine goal cell
-	PathfindCell *goalCell = getClippedCell( goalLayer,  to );
-	if (goalCell == nullptr)
-		return FALSE;
-
-
-	Bool isHuman = true;
-	if (obj && obj->getControllingPlayer() && (obj->getControllingPlayer()->getPlayerType()==PLAYER_COMPUTER)) {
-		isHuman = false; // computer gets to cheat.
-	}
-	Bool center;
-	Int radius;
-	getRadiusAndCenter(obj, radius, center);
-
-	// determine start cell
-	ICoord2D startCellNdx;
-	worldToCell(dest, &startCellNdx);
-	PathfindCell *parentCell = getCell( layer, startCellNdx.x, startCellNdx.y );
-	if (parentCell == nullptr)
-		return FALSE;
-	ICoord2D pos2d;
-	worldToCell(to, &pos2d);
-	if (!goalCell->allocateInfo(pos2d)) {
-		return FALSE;
-	}
-
-	if (parentCell!=goalCell) {
-		if (!parentCell->allocateInfo(startCellNdx)) {
-#if RETAIL_COMPATIBLE_PATHFINDING
-			if (!s_useFixedPathfinding)	{
-				desiredCell->releaseInfo();
-			}
-#endif
-			goalCell->releaseInfo();
-			return FALSE;
-		}
-	}
-
-	PathfindCell *closestCell = nullptr;
-	Real closestDistanceSqr = FLT_MAX;
-	Coord3D closestPos;
-
-	if (validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), parentCell ) == false) {
-		parentCell->releaseInfo();
-		goalCell->releaseInfo();
-		return FALSE;
-	}
-
-	parentCell->startPathfind(goalCell);
-
-	// initialize "open" list to contain start cell
-#if RETAIL_COMPATIBLE_PATHFINDING
-	if (!s_useFixedPathfinding) {
-		m_openList.reset(parentCell);
-	}
-	else
-#endif
-	{
-		m_openList.reset();
-		parentCell->putOnSortedOpenList(m_openList);
-	}
-
-	// "closed" list is initially empty
-	m_closedList.reset();
-
-	//
-	// Continue search until "open" list is empty, or
-	// until goal is found.
-	//
-	while( !m_openList.empty() )
-	{
-		// take head cell off of open list - it has lowest estimated total path cost
-		parentCell = m_openList.getHead();
-		parentCell->removeFromOpenList(m_openList);
-
-		Coord3D pos;
-		// put parent cell onto closed list - its evaluation is finished
-		parentCell->putOnClosedList( m_closedList );
-		if (checkForAdjust(obj, locomotorSet, isHuman, parentCell->getXIndex(), parentCell->getYIndex(), parentCell->getLayer(),
-			radius, center, &pos, groupDest)) {
-			Int dx = IABS(goalCell->getXIndex()-parentCell->getXIndex());
-			Int dy = IABS(goalCell->getYIndex()-parentCell->getYIndex());
-			Real distSqr = dx*dx+dy*dy;
-
-			if (distSqr < closestDistanceSqr) {
-				closestCell = parentCell;
-				closestDistanceSqr = distSqr;
-				closestPos = pos;
-			} else {
-				continue;
-			}
-		} else {
-			continue;
-		}
-
-		if (cellCount > MAX_CELL_COUNT) {
-			continue;
-		}
-		// Check to see if we can change layers in this cell.
-		checkChangeLayers(parentCell);
-
-		// expand search to neighboring orthogonal cells
-		static ICoord2D delta[] =
-		{
-			{ 1, 0 }, { 0, 1 }, { -1, 0 }, { 0, -1 },
-			{ 1, 1 }, { -1, 1 }, { -1, -1 }, { 1, -1 }
-		};
-		const Int numNeighbors = 8;
-		const Int firstDiagonal = 4;
-		ICoord2D newCellCoord;
-		PathfindCell *newCell;
-		const Int adjacent[5] = {0, 1, 2, 3, 0};
-		Bool neighborFlags[8] = { 0 };
-
-		UnsignedInt newCostSoFar = 0;
-
-		for( int i=0; i<numNeighbors; i++ )
-		{
-			neighborFlags[i] = false;
-			// determine neighbor cell to try
-			newCellCoord.x = parentCell->getXIndex() + delta[i].x;
-			newCellCoord.y = parentCell->getYIndex() + delta[i].y;
-
-			// get the neighboring cell
-			newCell = getCell(parentCell->getLayer(), newCellCoord.x, newCellCoord.y );
-
-			// check if cell is on the map
-			if (newCell == nullptr)
-				continue;
-
-			// check if this neighbor cell is already on the open (waiting to be tried)
-			// or closed (already tried) lists
-			Bool onList = false;
-			if (newCell->hasInfo()) {
-				if (newCell->getOpen() || newCell->getClosed())
-				{
-					// already on one of the lists
-					onList = true;
-				}
-			}
-			if (i>=firstDiagonal) {
-				// make sure one of the adjacent sides is open.
-				if (!neighborFlags[adjacent[i-4]] && !neighborFlags[adjacent[i-3]]) {
-					continue;
-				}
-			}
-
-			if (!validMovementPosition( isCrusher, locomotorSet.getValidSurfaces(), newCell, parentCell )) {
-				continue;
-			}
-
-			neighborFlags[i] = true;
-
-			if (!newCell->allocateInfo(newCellCoord)) {
-				// Out of cells for pathing...
-#if RETAIL_COMPATIBLE_PATHFINDING
-				if (s_useFixedPathfinding)
-#endif
-				{
-					cleanOpenAndClosedLists();
-					goalCell->releaseInfo();
-				}
- 				return cellCount;
-			}
-			cellCount++;
-
-			newCostSoFar = newCell->costSoFar( parentCell );
-			newCell->setBlockedByAlly(false);
-
-			// check if this neighbor cell is already on the open (waiting to be tried)
-			// or closed (already tried) lists
-			if (onList)
-			{
-				// already on one of the lists - if existing costSoFar is less,
-				// the new cell is on a longer path, so skip it
-				if (newCell->getCostSoFar() <= newCostSoFar)
-					continue;
-			}
-
-			// keep track of path we're building - point back to cell we moved here from
-			newCell->setParentCell(parentCell) ;
-
-			// store cost of this path
-			newCell->setCostSoFar(newCostSoFar);
-
-			Int costRemaining = 0;
-			if (goalCell) {
-				costRemaining = newCell->costToGoal( goalCell );
-			}
-
-			newCell->setTotalCost(newCell->getCostSoFar() + costRemaining) ;
-
-			// if newCell was on closed list, remove it from the list
-			if (newCell->getClosed())
-				newCell->removeFromClosedList( m_closedList );
-
-			// if the newCell was already on the open list, remove it so it can be re-inserted in order
-			if (newCell->getOpen())
-				newCell->removeFromOpenList( m_openList );
-
-			// insert newCell in open list such that open list is sorted, smallest total path cost first
-			newCell->putOnSortedOpenList( m_openList );
-		}
-	}
-
-#if defined(RTS_DEBUG)
-	if (closestCell) {
-		debugShowSearch(true);
-		*dest = closestPos;
-	} else {
-		debugShowSearch(true);
-	}
-#endif
-	m_isTunneling = false;
-#if RETAIL_COMPATIBLE_PATHFINDING
-	if (!s_useFixedPathfinding) {
-		cleanOpenAndClosedLists();
-		goalCell->releaseInfo();
-	}
-	else
-#endif
-	{
-		cleanOpenAndClosedLists();
-		parentCell->releaseInfo();
-		goalCell->releaseInfo();
-	}
-
-	return false;
-}
-
 struct TightenPathStruct
 {
 	Object *obj;

GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h

@@ -798,9 +798,6 @@ class Pathfinder : PathfindServicesInterface, public Snapshot
 										Bool centerInCell, Int radius, const ICoord2D &startCellNdx,
 										const Object *obj, Int attackDistance);
 
- 	Bool pathDestination( Object *obj, const LocomotorSet& locomotorSet, Coord3D *dest,
-		PathfindLayerEnum layer, const Coord3D *groupDest);	///< Checks cost between given locations
-
 	Int checkPathCost(Object *obj, const LocomotorSet& locomotorSet, const Coord3D *from,
 		const Coord3D *to);