Fixes #3208: bounce mriceblock to bonusblock by bumper doesn't go back #3225
Conversation
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
…t go back When a MrIceBlock is kicked into a trampoline, it bounces back facing backwards. The collision_solid() function, when the MrIceBlock's state is KICKED (which is the case), didn't expect to receive a hit from the right while facing left, and vice-versa. I added that condition and made it so it plays the collision sound and goes back, just like normal, but skips the flipping orientation, as it should slide forward and not backwards. Closes SuperTux#3208
|
@tobbi could you look at this? Thanks |
|
Technically, this is very similar to the if statement before, could you try to unify those two statements into one? |
|
Done. Apologies for the delay, had a few technical issues I could only resolve at home. I believe this is the most concise way I can make it. |
Looks good from my perspective! |
|
Should we ask for other reviews? |
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.
When a MrIceBlock is kicked into a trampoline, it bounces back facing backwards. The collision_solid() function, when the MrIceBlock's state is KICKED (which is the case), didn't expect to receive a hit from the right while facing left, and vice-versa. I added that condition and made it so it plays the collision sound and goes back, just like normal, but skips the flipping orientation, as it should slide forward and not backwards.
Video demonstration: https://www.youtube.com/watch?v=oAgOuTEf52w
Closes #3208