Replicate AI path function changes from GeneralsMD

Author: bobtista

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

@@ -536,15 +536,15 @@ class AICommandInterface
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowExitProductionPath( std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
+	void aiFollowExitProductionPath( std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_EXITPRODUCTION_PATH, cmdSource);
 		move_or_swap(parms.m_coords, *path);
 		parms.m_obj = ignoreObject;
 		aiDoCommand(&parms);
 	}
 
-	inline void aiFollowPath( std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
+	void aiFollowPath( std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource )
 	{
 		AICommandParms parms(AICMD_FOLLOW_PATH, cmdSource);
 		move_or_swap(parms.m_coords, *path);

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

@@ -95,10 +95,7 @@ void AICommandParmsStorage::store(const AICommandParms& parms)
   m_obj = parms.m_obj ? parms.m_obj->getID() : INVALID_ID;
   m_otherObj = parms.m_otherObj ? parms.m_otherObj->getID() : INVALID_ID;
   m_teamName = parms.m_team ? parms.m_team->getName() : AsciiString::TheEmptyString;
-	// We intentionally const_cast here so we can move the path coordinates into storage.
-	// AICommandParms is treated as a transient command container that is not reused after dispatch.
-	std::vector<Coord3D>& coords = const_cast<std::vector<Coord3D>&>(parms.m_coords);
-	move_or_swap(m_coords, coords);
+	m_coords = parms.m_coords;
   m_waypoint = parms.m_waypoint;
   m_polygon = parms.m_polygon;
   m_intValue = parms.m_intValue;       /// misc usage

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp

@@ -2620,7 +2620,7 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
 			break;
 		case AICMD_FOLLOW_PATH:
 		{
-			// Keep AICommandParms const; use a local copy of the coordinates when following the path.
+			// Copy coordinates to a local vector since privateFollowPath requires a non-const pointer.
 			std::vector<Coord3D> coords = parms->m_coords;
 			privateFollowPath(&coords, parms->m_obj, parms->m_cmdSource, FALSE);
 			break;
@@ -2630,7 +2630,7 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
 			break;
 		case AICMD_FOLLOW_EXITPRODUCTION_PATH:
 		{
-			// Keep AICommandParms const; use a local copy of the coordinates when following the exit path.
+			// Copy coordinates to a local vector since privateFollowPath requires a non-const pointer.
 			std::vector<Coord3D> coords = parms->m_coords;
 			privateFollowPath(&coords, parms->m_obj, parms->m_cmdSource, TRUE);
 			break;