fix(contain): Fix compile errors with RETAIL_COMPATIBLE_CRC 0#1411
Merged
xezon merged 1 commit intoAug 3, 2025
Merged
Conversation
xezon
added
Minor
Mauller
reviewed
Aug 3, 2025
| DamageInfo damageInfo; | ||
| damageInfo.in.m_damageType = DAMAGE_UNRESISTABLE; | ||
| damageInfo.in.m_deathType = data->m_isBurnedDeathToUnits ? DEATH_BURNED : DEATH_NORMAL; | ||
| damageInfo.in.m_deathType = DEATH_BURNED; |
There was a problem hiding this comment.
This change looks like it alters behaviour, is the damage always set to true for burned to death?
There was a problem hiding this comment.
The change seems correct - damageInfo.in.m_deathType = DEATH_BURNED; was the original line in Generals. I gather the non-retail compatible block introduced here in #1019 was copied from the Zero Hour version.
Author
There was a problem hiding this comment.
Yes the compile errors happened because I just slapped the diff to Generals without checking if it is ABI compatible.
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Nov 10, 2025
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Feb 23, 2026
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
3 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.
This fixes the compile errors in Generals'
OpenContain::processDamageToContainedwithRETAIL_COMPATIBLE_CRC 0.