perf(fps): optimize Object::isHero with cached hero counter #1841
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bobtista
force-pushed
the
bobtista/optimize-object-is-hero
branch
from
bcbf169 to
386443b
Compare
xezon
reviewed
Dec 15, 2025
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
Show resolved
Hide resolved
Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
Outdated
Show resolved
Hide resolved
Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
Outdated
Show resolved
Hide resolved
xezon
added
Minor
bobtista
force-pushed
the
bobtista/optimize-object-is-hero
branch
from
4482d08 to
df4e579
Compare
xezon
reviewed
Dec 15, 2025
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
Currently this will break Xfer Save and Load.
| } | ||
| } | ||
| } | ||
| if( rider->isKindOf( KINDOF_HERO ) && m_heroUnitsContained > 0 ) |
There was a problem hiding this comment.
Make the m_heroUnitsContained > 0 an assert, because we do not expect this to be 0 here, right?
| xfer->xferUnsignedInt( &m_stealthUnitsContained ); | ||
|
|
||
| // hero units contained | ||
| xfer->xferUnsignedInt( &m_heroUnitsContained ); |
There was a problem hiding this comment.
This requires Xfer version increment. And version history documentation. Also needs to be put behind RETAIL_COMPATIBLE_XFER_SAVE. See other code that does it.
In RETAIL_COMPATIBLE_XFER_SAVE, the count needs to be restored by iterating hero objects like the original code did it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Optimizes
Object::isHero()by caching hero count in containers instead of iterating through all contained objects on every call.