Various crusher fixes #3047
Various crusher fixes #3047
Conversation
|
Will test tm. |
tobbi
changed the title
|
I've added a fix for an issue found by frost, where roots would spawn in the wrong direction. |
|
@bruhmoent Could you test as well? |
|
Yes. I will soon. |
|
I moved some code out but I don't know what |
|
@Vankata453 @MatusGuy Can you guys test the code changes and merge maybe? |
src/object/player.cpp
Outdated
| if ((hit.left || hit.right)) { | ||
| if (m_ignore_sideways_crush) { | ||
| m_ignore_sideways_crush = false; | ||
| } | ||
| else { | ||
| kill(true); | ||
| } |
There was a problem hiding this comment.
If tux isn't killed immediately when crushed vertically, then why can't it also happen here? This way you remove the ignore_sidways_crush thing. But I might be missing something
| // If the other object is the player, and the collision is at the | ||
| // bottom of the crusher, hurt the player. |
There was a problem hiding this comment.
This comment doesn't reflect the changes (sideways collision also now hurts the player).
src/object/player.cpp
Outdated
| if ((hit.left || hit.right)) { | ||
| if (m_ignore_sideways_crush) { | ||
| m_ignore_sideways_crush = false; | ||
| } | ||
| else { | ||
| kill(true); | ||
| } |
There was a problem hiding this comment.
Couldn't we make it so that despite of the side where Tux was hit from, kill(false) is performed? Is there a reason for sideways crushing to instantly kill Tux with kill(true)?
If we do that, m_ignore_sideways_crush wouldn't be needed.
This also includes some code style improvements to the
Crusher::collisionand relieves some of the mental pain I have when looking at the SuperTux source code.Fixes #3024