Skip to content

Commit e97db76

Browse files
committed
refactor(perf): make m_coords mutable to remove const_cast
1 parent 87948f9 commit e97db76

File tree

4 files changed

+6
-6
lines changed
  • GeneralsMD/Code/GameEngine
  • Generals/Code/GameEngine

4 files changed

+6
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ struct AICommandParms
407407
Object* m_obj;
408408
Object* m_otherObj;
409409
const Team* m_team;
410-
std::vector<Coord3D> m_coords;
410+
mutable std::vector<Coord3D> m_coords;
411411
const Waypoint* m_waypoint;
412412
const PolygonTrigger* m_polygon;
413413
Int m_intValue; /// misc usage

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,13 +2619,13 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
26192619
privateFollowWaypointPathAsTeamExact(parms->m_waypoint, parms->m_cmdSource);
26202620
break;
26212621
case AICMD_FOLLOW_PATH:
2622-
privateFollowPath(&const_cast<AICommandParms*>(parms)->m_coords, parms->m_obj, parms->m_cmdSource, FALSE);
2622+
privateFollowPath(&parms->m_coords, parms->m_obj, parms->m_cmdSource, FALSE);
26232623
break;
26242624
case AICMD_FOLLOW_PATH_APPEND:
26252625
privateFollowPathAppend(&parms->m_pos, parms->m_cmdSource);
26262626
break;
26272627
case AICMD_FOLLOW_EXITPRODUCTION_PATH:
2628-
privateFollowPath(&const_cast<AICommandParms*>(parms)->m_coords, parms->m_obj, parms->m_cmdSource, TRUE);
2628+
privateFollowPath(&parms->m_coords, parms->m_obj, parms->m_cmdSource, TRUE);
26292629
break;
26302630
case AICMD_ATTACK_OBJECT:
26312631
privateAttackObject(parms->m_obj, parms->m_intValue, parms->m_cmdSource);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ struct AICommandParms
420420
Object* m_obj;
421421
Object* m_otherObj;
422422
const Team* m_team;
423-
std::vector<Coord3D> m_coords;
423+
mutable std::vector<Coord3D> m_coords;
424424
const Waypoint* m_waypoint;
425425
const PolygonTrigger* m_polygon;
426426
Int m_intValue; /// misc usage

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2681,13 +2681,13 @@ void AIUpdateInterface::aiDoCommand(const AICommandParms* parms)
26812681
privateFollowWaypointPathAsTeamExact(parms->m_waypoint, parms->m_cmdSource);
26822682
break;
26832683
case AICMD_FOLLOW_PATH:
2684-
privateFollowPath(&const_cast<AICommandParms*>(parms)->m_coords, parms->m_obj, parms->m_cmdSource, FALSE);
2684+
privateFollowPath(&parms->m_coords, parms->m_obj, parms->m_cmdSource, FALSE);
26852685
break;
26862686
case AICMD_FOLLOW_PATH_APPEND:
26872687
privateFollowPathAppend(&parms->m_pos, parms->m_cmdSource);
26882688
break;
26892689
case AICMD_FOLLOW_EXITPRODUCTION_PATH:
2690-
privateFollowPath(&const_cast<AICommandParms*>(parms)->m_coords, parms->m_obj, parms->m_cmdSource, TRUE);
2690+
privateFollowPath(&parms->m_coords, parms->m_obj, parms->m_cmdSource, TRUE);
26912691
break;
26922692
case AICMD_ATTACK_OBJECT:
26932693
privateAttackObject(parms->m_obj, parms->m_intValue, parms->m_cmdSource);

0 commit comments

Comments
 (0)