[GEN][ZH] Fix Hero Radar icon garrison issues introduced by #1035#1267
Merged
xezon merged 2 commits intoTheSuperHackers:mainfrom Jul 16, 2025
Merged
[GEN][ZH] Fix Hero Radar icon garrison issues introduced by #1035#1267xezon merged 2 commits intoTheSuperHackers:mainfrom
xezon merged 2 commits intoTheSuperHackers:mainfrom
Conversation
|
This fixes a crash for me probably introduced by the recent changes to the hero radar. I tried to load a save game from a couple of weeks ago and got a crash here because Callstack: |
f90615f to
7d29b52
Compare
Author
|
Replicated to Generals without conflicts. |
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Nov 10, 2025
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.
This change fixes #1246, which was introduced with #1035 and #1240. There were actually 3 bugs remaining:
To fix that, I reinstanted the "calcHero" code that the original EA code had, in combination with code that takes care of cleaning up the object pointers to avoid dangling.
I did experiment with several implementations and there are many pitfalls when doing it just not the right way. I tried removing and adding Geros and Buildings containing Heros on containing and uncontaining, but that was doomed with Saveload, because after Load the order of containment is not favourable for this to work.
TODO