Refactor unit map layers #1083
Merged
Refactor unit map layers #1083
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
Encapsulating unit drawing in a class will allow for more complex options because it reduces the conceptual complexity of the code.
If one wants to draw a unit type, there's a very fitting function get_unittype_sprite in the tileset. There is no reason for the map view to duplicate this functionality with another implementation.
They were no longer used. This commit also removes the unit type parameter from fill_sprite_array functions, which was also never used.
lmoureaux
added
refactoring
It's used only once in the function. What was the reason for making it a parameter in the first place?
It was only ever set to tile_city(ptile). It is better to call it in the implementation, otherwise one could wonder when pcity isn't the city on the tile being drawn.
'backdrop' was made useless when removing 'pcity'.
We have layer::do_draw_unit, so use it. Also simplify away the XOR.
lmoureaux
force-pushed
the
refactor/layer_units
branch
from
519674c to
816a04e
Compare
Only those units that are focused should be drawn on the corresponding layer.
psampathkumar
approved these changes
Jul 9, 2022
There was a problem hiding this comment.
Take this chance to move layers to a separate folder ? I think something like, client/layers/layer_*.cpp/h is better. But I'll approve anyways, since that can be done in a different PR, where we reorganize everything within client. Apart from that, rest look good to me.
|
Thanks for the review! I agree that layer classes should eventually be moved to another folder, but I'm not sure how to call it: it could be for instance |
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 PR refactors the code that draws units on the map and some code around it. I wanted to implement #429 but figured that some refactoring was needed first. This PR introduces no behavior change.
Things to check