Code cleanup to address godot4 PR comments #484
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
…e, renamed things to improve clarity.
QuintillusCFC
approved these changes
Jan 4, 2025
| @@ -48,51 +48,9 @@ public void TerrainAsTileMap() { | |||
| { | |||
| foreach (Tile tile in Civ3Tiles) | |||
| { | |||
| // If tile media file not loaded yet | |||
| if (TileIDLookup[tile.ExtraInfo.BaseTerrainFileID, 1] == 0) { LoadTileSet(tile.ExtraInfo.BaseTerrainFileID); } | |||
There was a problem hiding this comment.
Should the remaining references to TileIDLookup also be removed? The lines that are now lines 51-52, just below this removed block, look odd now, setting the Map int[] to 0, and then looking it up via TileIDLookup which will now always be zero.
Granted I don't entirely remember the purpose of this section. It looks like it was added back in March of '21, to implement a legacy map base terrain viewer. But I suspect those lines can additionally be removed. The changes are working for me in-game (and the much-decreased amount of magic numbers is nice).
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.
Resolved some of the open comment threads by pruning dead or commented out code and renaming things. Civ3Map.LoadTileSet did not seem to serve any purpose anymore, as it did not return or modify anything outside of the method. I did not address the question of what purpose MovingSprite serves in Civ3Unit or what its values mean.