Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with live fire not fading after colliding with bomb #1405

Merged

Conversation

martinvanzijl
Copy link
Contributor

Fixes #1403, at least partially. The walking fire will fade properly when Tux collides with it while carrying a bomb. Demo below:

Before:

fire-bomb-fix-before

After:

fire-bomb-fix-after

However, the fire still goes diagonally down while fading (into the ground), which looks awkward. But at least it fades.

The problem was in LiveFire::active_update line 63-66, if state was still STATE_WALKING, the sprite action would be set to regular walking (not fading) just after hitting the bomb. Since collision group is set to COLGROUP_DISABLED, it also would not interact with objects anymore. So an extra state is added STATE_DEAD to avoid this.

@tobbi tobbi merged commit baf3cb4 into SuperTux:master May 21, 2020
@martinvanzijl martinvanzijl deleted the issue-1403-walking-fire-bomb-fix branch May 23, 2020 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Walking fire continues walking after a bomb kills it
2 participants