Fix interaction when pushing character off of falling tile #563
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
mrimer
reviewed
Dec 28, 2023
| @@ -105,7 +105,7 @@ CMonster::CMonster( | |||
| , bAlive(true) | |||
| , bForceWeaponAttack(false) | |||
| , stunned(0), bNewStun(false) | |||
| , bPushedThisTurn(false) | |||
| , bPushedThisTurn(false), bPushedOtherMonster(false) | |||
There was a problem hiding this comment.
Suggest we reset this var in CMonster::Clear().
mrimer
approved these changes
Dec 28, 2023
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.
If a falling tile such as a trapdoor drops by having an monster pushed off of it, it is possible for the pushing entity to end up on an otherwise impassable pit or water tile. This is inconsistent with other situations where a tile is altered to pit or water beneath an entity, which can lead to them dropping or drowning.
To fix, monsters now set a flag
bPushedOtherMonsterwhen they body push a monster. If this flag is set after their movement is processed, monsters that can push other monsters will callCDbRoom::CheckForFallingAtat their new position. This will cause them to drop if their destination tile is unsuitable.CCurrentGame::ProcessPlayerhas had a similar change made to allow the same for player movement.