[GEN][ZH] Fix nationalism and fanaticism bonuses being applied independent of horde status - #385
Closed
Generalcamo wants to merge 2 commits into
Closed
Generalcamo wants to merge 2 commits into
Generalcamo wants to merge 2 commits into
Conversation
…ardless of horde status.
Generalcamo
added
Bug
xezon
reviewed
Mar 6, 2025
Generalcamo
commented
Mar 6, 2025
Generalcamo
commented
Mar 6, 2025
sorcerer86pt
approved these changes
Mar 7, 2025
Mauller
reviewed
Jul 15, 2025
|
|
||
| } // end if | ||
| else | ||
| // nationalism |
There was a problem hiding this comment.
This needs wrapping in a conditional block so we can merge the fix into the codebase while maintaining compatibility for now, in the future we can remove the compatibility and the fix will be in the code.
#if !RETAIL_COMPATIBLE_CRC
fixed nationalism code here
#endifblock
Mauller
reviewed
Jul 15, 2025
| us->clearWeaponBonusCondition( WEAPONBONUSCONDITION_NATIONALISM ); | ||
| } | ||
| } | ||
| else { |
There was a problem hiding this comment.
The original nationalism code block needs putting back and wrapping in a
#if RETAIL_COMPATIBLE_CRC
original nationalism code
#endifblock
Mauller
reviewed
Jul 15, 2025
| //if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) ) | ||
| // draw->setTerrainDecal(TERRAIN_DECAL_NONE); | ||
|
|
||
| // TheSuperHackers @bugfix GeneralCamo 06/03/2025 Corrected nationalism being applied regardless of horde status - issue #173 |
There was a problem hiding this comment.
can drop the issue at the end of the comment and the comment wants to be more concise to what it is fixing
"prevent nationalism being applied independent of horde status" etc
Mauller
reviewed
Jul 15, 2025
| //if ( draw && !us->isKindOf( KINDOF_PORTABLE_STRUCTURE ) ) | ||
| // draw->setTerrainDecal(TERRAIN_DECAL_NONE); | ||
|
|
||
| // TheSuperHackers @bugfix GeneralCamo 06/03/2025 Corrected nationalism being applied regardless of horde status - issue #173 |
There was a problem hiding this comment.
Ditto in the zero hour changes as to the generals changes, but applied to both nationalism and fanaticism
Mauller
changed the title
Mauller
added
Minor
Merged
2 tasks
|
I have reimplemented the fix in #1582, because this change breaks retail compatibility but it should not do that by default. |
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
4 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 PR fixes Nationalism and Fanaticism bonuses being applied independent of horde status.