Repository navigation
fix(terrain): Port merged TheSuperHackers map and terrain fixes - #638
Open
tintinhamans wants to merge 3 commits into
Open
tintinhamans wants to merge 3 commits into
tintinhamans wants to merge 3 commits into
Conversation
…uperHackers#3489) (cherry picked from commit 02b5b56)
…blend tile data (TheSuperHackers#3482) (cherry picked from commit a5780c8)
… allocations (TheSuperHackers#3486) (cherry picked from commit 5d69c00)
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.
Ports three merged upstream fixes for crashes and leaks when loading maps and drawing rivers. Each is a
cherry-pick -xof the upstream commit.MapReaderWriterInfo.hexists once per game here, so TheSuperHackers#3486 is applied to both theGeneralsandGeneralsMDcopies. The rest is inCore.Zero Hour (
z_generals) builds here. TheGeneralscopy ofMapReaderWriterInfo.hwas not compiled,g_generalsdoes not build on this branch.