bugfix(contain): Restore retail compatibility after changes to Object::m_containedByID#2868
Merged
xezon merged 6 commits intoJul 24, 2026
Conversation
Caball009
marked this pull request as ready for review
July 12, 2026 20:26
|
| Filename | Overview |
|---|---|
| GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HelixContain.cpp | Updates Helix portable add and removal paths to maintain the retail-compatible containment ID. |
| GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp | Moves containment-pointer updates into an out-of-line setter and preserves explicitly maintained IDs during transfer. |
| GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h | Declares the containment setters used by specialized contain modules. |
| Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp | Mirrors the object containment setter and transfer behavior for Generals. |
| Generals/Code/GameEngine/Include/GameLogic/Object.h | Mirrors the containment setter declarations for Generals. |
Reviews (9): Last reviewed commit: "Replicated in Generals." | Re-trigger Greptile
Caball009
force-pushed
the
restore_retail_comp_helixcontain
branch
2 times, most recently
from
July 12, 2026 21:21
7dfc59f to
fc1d119
Compare
Caball009
marked this pull request as draft
July 12, 2026 21:23
Caball009
marked this pull request as ready for review
July 12, 2026 23:47
xezon
reviewed
Jul 13, 2026
2 tasks
Caball009
force-pushed
the
restore_retail_comp_helixcontain
branch
from
July 13, 2026 21:36
fc1d119 to
ffc3f76
Compare
Caball009
force-pushed
the
restore_retail_comp_helixcontain
branch
3 times, most recently
from
July 13, 2026 22:04
bba092c to
5da1074
Compare
Caball009
force-pushed
the
restore_retail_comp_helixcontain
branch
from
July 24, 2026 10:24
5da1074 to
5bd8731
Compare
Author
|
Rebased, and replicated in Generals with two notes:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR #2747 forgot to set the
containedByIDvariable for objects that make use of the helix container code. This causes a mismatch for the following 5 replays: replays.zipThis PR adds the same code that was added to
Object::onContainedBytoHelixContain::addToContainandHelixContain::addToContainListto fix the issue.Resetting the contain variables, as is done in the third commit, is not needed to restore retail compatibility. I added that code because I think it's correct to reset the contain variables when the object is removed from its container.
TODO: