unify: Merge ImageCollection and MapUtil code#1771
Merged
Conversation
xezon
added
Minor
1 task
xezon
force-pushed
the
xezon/unity-maputil
branch
from
efbb271 to
2285ef0
Compare
Author
|
Fixed GUIEdit compile error. |
Skyaero42
reviewed
Nov 1, 2025
|
|
||
| #if RTS_ZEROHOUR | ||
| //Patch 1.03 -- Purposely filter out these broken maps that exist in Generals. | ||
| if( !asciiMapName.compare( "maps\\armored fury\\armored fury.map" ) || |
There was a problem hiding this comment.
how broken are these? I would rather remove this part from ZH then exclude maps hardcoded.
Author
There was a problem hiding this comment.
I commented this out and tested in Zero Hour and both maps show in the list and do load successfully. I do not know why they were removed here. It is separate investigation. Maybe we can bring them back.
xezon
added a commit
that referenced
this pull request
Nov 1, 2025
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
Nov 10, 2025
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Feb 23, 2026
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
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.
Merge with Rebase
This change merges code in MapUtil and ImageCollection.
Generals gets
TODO