Converted the player palette to an enum class #303
Merged
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
mmatyas
requested changes
Apr 15, 2024
src/smw/player.h
Outdated
| @@ -90,6 +90,7 @@ class CPlayer | |||
| short getGlobalID() const { return globalID; } | |||
| short getTeamID() const { return teamID; } | |||
| short getColorID() const { return colorID; } | |||
| PlayerPalette getPlayerPalette(); | |||
| player.animationstate += 32; | ||
| if (player.animationstate > 96) | ||
| player.animationstate++; | ||
| if (player.animationstate > 3) |
There was a problem hiding this comment.
I think we can use the new enum values here too.
mmatyas
requested changes
Apr 16, 2024
| return invincibility_animation_states[(timer / 4) % 4]; | ||
| } else { | ||
| return invincibility_animation_states[((timer - 4) / 7) % 4]; | ||
| } |
There was a problem hiding this comment.
Is there any way we could make the indices more readable, that would explain why these numbers are used? for example,
- If you use
std::arrayfor the animation states, you can then use itssize()in the% 4part - The
/ 4and/ 7parts seem to control the speed of the animation – you could move them to a named variable - Why do we subtract
- 4in the second branch?
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.
No description provided.