Fix order template #210
Merged
Fix order template #210
Conversation
This file contains 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
This will allow players to see what land has been annhilated more easily.
jt-traub
commented
Sep 17, 2024
| @@ -4978,7 +4978,7 @@ static TerrainType td[] = { | |||
| {-1,-1,-1}, | |||
| 0,-1,-1,-1, | |||
| 0,{-1,-1,-1,-1,-1,-1}}, | |||
| {"ocean", "ocean", "barrenocean", '-', R_OCEAN, | |||
| {"deadwater", "deadwater", "barrenocean", '-', R_OCEAN, | |||
There was a problem hiding this comment.
This change is actually already in master.. it will merge cleanly. Github is just confused because I froze the NO v7 stable branch and am merging from a branch off of that onto master. The only real change in this commit is the change on line 900 in text_report_generator.cpp
valdisz
approved these changes
Sep 18, 2024
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.
Fix bug where a passed-through hex showed up in order template