refactor(perf): replicate aiDoCommand non-const changes to Generals

bobtista · bobtista · commit 21d87f9a4c70 · 2025-11-29T14:02:33.000-05:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h
@@ -436,7 +436,7 @@ class AICommandParmsStorage
 	Path*										m_path;
 
 public:
-	void store(const AICommandParms& parms);
+	void store(AICommandParms& parms);
 	void reconstitute(AICommandParms& parms) const;
 	void doXfer(Xfer *xfer);
 };
@@ -452,7 +452,7 @@ class AICommandInterface
 {
 public:
 
-	virtual void aiDoCommand(const AICommandParms* parms) = 0;
+	virtual void aiDoCommand(AICommandParms* parms) = 0;
 
 	inline void aiMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )
 	{
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
@@ -340,7 +340,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 	virtual void onObjectCreated();
 	virtual void doQuickExit( const std::vector<Coord3D>* path );			///< get out of this Object
 
-	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 
 	virtual const Coord3D *getGuardLocation( void ) const { return &m_locationToGuard;	}
 	virtual ObjectID getGuardObject( void ) const { return m_objectToGuard; }
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h
@@ -90,7 +90,7 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo
 	AssaultTransportAIUpdate( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
- 	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 	virtual Bool isIdle() const;
 	virtual UpdateSleepTime update();
 	virtual AssaultTransportAIInterface* getAssaultTransportAIInterface() { return this; }
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h
@@ -84,7 +84,7 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate
 	// virtual destructor prototype provided by memory pool declaration
 
 	virtual UpdateSleepTime update();
- 	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 	virtual Bool chooseLocomotorSet(LocomotorSetType wst);
 	// this is present solely for some transports to override, so that they can land before
 	// allowing people to exit...
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
@@ -95,7 +95,7 @@ class DeployStyleAIUpdate : public AIUpdateInterface
 	DeployStyleAIUpdate( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
- 	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 	virtual Bool isIdle() const;
 	virtual UpdateSleepTime update();
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h
@@ -266,7 +266,7 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface
 	// the following methods must be overridden so that if a player issues a command the dozer
 	// can exit the internal state machine and do whatever the player says
 	//
-	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 
 
 protected:
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h
@@ -192,7 +192,7 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte
 	HackInternetAIUpdate( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype provided by memory pool declaration
 
- 	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 
 	Real getPackUnpackVariationFactor() const { return getHackInternetAIUpdateModuleData()->m_packUnpackVariationFactor; }
 	UnsignedInt getUnpackTime()					const;
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
@@ -84,7 +84,7 @@ class JetAIUpdate : public AIUpdateInterface
 	virtual void onObjectCreated();
 	virtual void onDelete();
 
- 	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 	virtual Bool chooseLocomotorSet(LocomotorSetType wst);
 	virtual void setLocomotorGoalNone();
 	virtual Bool isIdle() const;
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h
@@ -105,7 +105,7 @@ class POWTruckAIUpdate : public AIUpdateInterface,
 	// the following methods must be overridden so that if a player issues a command the dozer
 	// can exit the internal state machine and do whatever the player says
 	//
-	virtual void aiDoCommand( const AICommandParms *parms );
+	virtual void aiDoCommand( AICommandParms *parms );
 
 protected:
 
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h
@@ -64,7 +64,7 @@ class RailedTransportAIUpdate : public AIUpdateInterface
 	// virtual destructor prototype provided by memory pool declaration
 
 	// AIUpdate interface methods
-	virtual void aiDoCommand( const AICommandParms *parms );
+	virtual void aiDoCommand( AICommandParms *parms );
 	virtual UpdateSleepTime update( void );
 
 protected:
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h
@@ -171,7 +171,7 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public
 	// the following methods must be overridden so that if a player issues a command the dozer
 	// can exit the internal state machine and do whatever the player says
 	//
-	virtual void aiDoCommand(const AICommandParms* parms);
+	virtual void aiDoCommand(AICommandParms* parms);
 
 // Supply truck stuff
 	virtual Int getNumberBoxes() const { return m_numberBoxes; }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
@@ -87,15 +87,15 @@ AICommandParms::AICommandParms(AICommandType cmd, CommandSourceType cmdSource) :
 }
 
 //----------------------------------------------------------------------------------------------------------
-void AICommandParmsStorage::store(const AICommandParms& parms)
+void AICommandParmsStorage::store(AICommandParms& parms)
 {
 	m_cmd = parms.m_cmd;
   m_cmdSource = parms.m_cmdSource;
   m_pos = parms.m_pos;
   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;
-	m_coords = parms.m_coords;
+	move_or_swap(m_coords, parms.m_coords);
   m_waypoint = parms.m_waypoint;
   m_polygon = parms.m_polygon;
   m_intValue = parms.m_intValue;       /// misc usage
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
@@ -2554,7 +2554,7 @@ Bool AIUpdateInterface::isAllowedToRespondToAiCommands(const AICommandParms* par
 }
 
 //-------------------------------------------------------------------------------------------------
-void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
+void AIUpdateInterface::aiDoCommand(AICommandParms* parms)
 {
 	// TheSuperHackers @info The AiCommandParms for m_obj, m_otherObj and m_team should be null tested before use.
 	// These variables could relate to a deleted object when a pending command is reconstituted.
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
@@ -80,7 +80,7 @@ AssaultTransportAIUpdate::~AssaultTransportAIUpdate( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void AssaultTransportAIUpdate::aiDoCommand(const AICommandParms* parms)
+void AssaultTransportAIUpdate::aiDoCommand(AICommandParms* parms)
 {
 	//Inspect the command and reset everything when necessary.
 	if( parms->m_cmdSource != CMD_FROM_AI )
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
@@ -1121,7 +1121,7 @@ void ChinookAIUpdate::privateCombatDrop( Object* target, const Coord3D& pos, Com
 }
 
 //-------------------------------------------------------------------------------------------------
-void ChinookAIUpdate::aiDoCommand(const AICommandParms* parms)
+void ChinookAIUpdate::aiDoCommand(AICommandParms* parms)
 {
 	// this gets reset every time a command is issued.
 	setAirfieldForHealing(INVALID_ID);
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DeployStyleAIUpdate.cpp
@@ -90,7 +90,7 @@ void DeployStyleAIUpdate::reset()
 }
 
 //-------------------------------------------------------------------------------------------------
-void DeployStyleAIUpdate::aiDoCommand( const AICommandParms* parms )
+void DeployStyleAIUpdate::aiDoCommand( AICommandParms* parms )
 {
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp
@@ -2329,7 +2329,7 @@ Real DozerAIUpdate::getBoredRange( void ) const
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-void DozerAIUpdate::aiDoCommand(const AICommandParms* parms)
+void DozerAIUpdate::aiDoCommand(AICommandParms* parms)
 {
 
 	//
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
@@ -121,7 +121,7 @@ UpdateSleepTime HackInternetAIUpdate::update( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
+void HackInternetAIUpdate::aiDoCommand(AICommandParms* parms)
 {
 	if (!isAllowedToRespondToAiCommands(parms))
 		return;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -2303,7 +2303,7 @@ Bool JetAIUpdate::isParkedAt(const Object* obj) const
 }
 
 //-------------------------------------------------------------------------------------------------
-void JetAIUpdate::aiDoCommand(const AICommandParms* parms)
+void JetAIUpdate::aiDoCommand(AICommandParms* parms)
 {
 	// call this from aiDoCommand as well as update, because this can
 	// be called before update ever is... if the unit is placed on a map,
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/POWTruckAIUpdate.cpp
@@ -111,7 +111,7 @@ void POWTruckAIUpdate::onDelete( void )
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void POWTruckAIUpdate::aiDoCommand( const AICommandParms *parms )
+void POWTruckAIUpdate::aiDoCommand( AICommandParms *parms )
 {
 
 	if (!isAllowedToRespondToAiCommands(parms))
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailedTransportAIUpdate.cpp
@@ -260,7 +260,7 @@ UpdateSleepTime RailedTransportAIUpdate::update( void )
 
 // ------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-void RailedTransportAIUpdate::aiDoCommand( const AICommandParms *parms )
+void RailedTransportAIUpdate::aiDoCommand( AICommandParms *parms )
 {
 
 	// if not allowed to respond to any command get out of here
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
@@ -950,7 +950,7 @@ const Coord3D* WorkerAIUpdate::getDockPoint( DozerTask task, DozerDockPoint poin
 // ------------------------------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------------------------------
-void WorkerAIUpdate::aiDoCommand(const AICommandParms* parms)
+void WorkerAIUpdate::aiDoCommand(AICommandParms* parms)
 {
 
 	//

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ class AICommandParmsStorage`
`436`	`436`	`Path* m_path;`
`437`	`437`
`438`	`438`	`public:`
`439`		`- void store(const AICommandParms& parms);`
	`439`	`+ void store(AICommandParms& parms);`
`440`	`440`	`void reconstitute(AICommandParms& parms) const;`
`441`	`441`	`void doXfer(Xfer *xfer);`
`442`	`442`	`};`
`@@ -452,7 +452,7 @@ class AICommandInterface`
`452`	`452`	`{`
`453`	`453`	`public:`
`454`	`454`
`455`		`- virtual void aiDoCommand(const AICommandParms* parms) = 0;`
	`455`	`+ virtual void aiDoCommand(AICommandParms* parms) = 0;`
`456`	`456`
`457`	`457`	`inline void aiMoveToPosition( const Coord3D *pos, CommandSourceType cmdSource )`
`458`	`458`	`{`