Skip to content

perf: Remove allocation overhead when retrieving labels for Waypoints() and PolygonTriggers() #2761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mauller wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

perf: Remove allocation overhead when retrieving labels for Waypoints() and PolygonTriggers() #2761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class PolygonTrigger : public MemoryPoolObject,
Int getID() const {return m_triggerID;}
PolygonTrigger *getNext() {return m_nextPolygonTrigger;}
const PolygonTrigger *getNext() const {return m_nextPolygonTrigger;}
AsciiString getTriggerName() const {return m_triggerName;} ///< Gets the trigger name.
const AsciiString& getTriggerName() const {return m_triggerName;} ///< Gets the trigger name.
Bool pointInTrigger(ICoord3D &point) const;
Bool doExportWithScripts() const {return m_exportWithScripts;}
void setDoExportWithScripts(Bool val) {m_exportWithScripts = val;}
Expand Down
6 changes: 3 additions & 3 deletions Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ class Waypoint : public MemoryPoolObject
/// Get the waypoint's position
const Coord3D *getLocation() const { return &m_location; }
/// Get the waypoint's first path label
AsciiString getPathLabel1() const { return m_pathLabel1; }
const AsciiString& getPathLabel1() const { return m_pathLabel1; }
/// Get the waypoint's second path label
AsciiString getPathLabel2() const { return m_pathLabel2; }
const AsciiString& getPathLabel2() const { return m_pathLabel2; }
/// Get the waypoint's third path label
AsciiString getPathLabel3() const { return m_pathLabel3; }
const AsciiString& getPathLabel3() const { return m_pathLabel3; }
/// Get bi-directionality.
Bool getBiDirectional() const { return m_biDirectional; }

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class PolygonTrigger : public MemoryPoolObject,
Int getID() const {return m_triggerID;}
PolygonTrigger *getNext() {return m_nextPolygonTrigger;}
const PolygonTrigger *getNext() const {return m_nextPolygonTrigger;}
AsciiString getTriggerName() const {return m_triggerName;} ///< Gets the trigger name.
const AsciiString& getTriggerName() const {return m_triggerName;} ///< Gets the trigger name.
Bool pointInTrigger(ICoord3D &point) const;
Bool doExportWithScripts() const {return m_exportWithScripts;}
void setDoExportWithScripts(Bool val) {m_exportWithScripts = val;}
Expand Down
6 changes: 3 additions & 3 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ class Waypoint : public MemoryPoolObject
/// Get the waypoint's position
const Coord3D *getLocation() const { return &m_location; }
/// Get the waypoint's first path label
AsciiString getPathLabel1() const { return m_pathLabel1; }
const AsciiString& getPathLabel1() const { return m_pathLabel1; }
/// Get the waypoint's second path label
AsciiString getPathLabel2() const { return m_pathLabel2; }
const AsciiString& getPathLabel2() const { return m_pathLabel2; }
/// Get the waypoint's third path label
AsciiString getPathLabel3() const { return m_pathLabel3; }
const AsciiString& getPathLabel3() const { return m_pathLabel3; }
/// Get bi-directionality.
Bool getBiDirectional() const { return m_biDirectional; }

Expand Down
Loading