Fix #3685: Prevent coin collection through solid weak blocks#3762
Open
baltazarReis wants to merge 1 commit into
Open
Fix #3685: Prevent coin collection through solid weak blocks#3762baltazarReis wants to merge 1 commit into
baltazarReis wants to merge 1 commit into
Conversation
MatusGuy
requested changes
Jun 8, 2026
Comment on lines
+49
to
+51
|
|
||
| /** Check if this block is still solid (not destroyed) and blocking objects */ | ||
| inline bool is_solid_block() const { return state != STATE_DISINTEGRATING; } |
Contributor
There was a problem hiding this comment.
Is this really necessary? Getting this information from the current collision group would be much more accurate and would not require this extra method.
Suggested change
| /** Check if this block is still solid (not destroyed) and blocking objects */ | |
| inline bool is_solid_block() const { return state != STATE_DISINTEGRATING; } |
Comment on lines
+250
to
+258
| if (weak_block.is_solid_block()) { | ||
| const Rectf& block_bbox = weak_block.get_bbox(); | ||
| if (coin_center.x >= block_bbox.get_left() && | ||
| coin_center.x <= block_bbox.get_right() && | ||
| coin_center.y >= block_bbox.get_top() && | ||
| coin_center.y <= block_bbox.get_bottom()) { | ||
| return ABORT_MOVE; | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Without that extra method, it becomes easier to write this in a concise manner:
Suggested change
| if (weak_block.is_solid_block()) { | |
| const Rectf& block_bbox = weak_block.get_bbox(); | |
| if (coin_center.x >= block_bbox.get_left() && | |
| coin_center.x <= block_bbox.get_right() && | |
| coin_center.y >= block_bbox.get_top() && | |
| coin_center.y <= block_bbox.get_bottom()) { | |
| return ABORT_MOVE; | |
| } | |
| } | |
| if (weak_block.get_group() == COLGROUP_DISABLED) | |
| continue; | |
| if (weak_block.get_bbox().contains(coin_center)) | |
| return ABORT_MOVE; |
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
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.
This PR fixes a bug where players could collect coins trapped inside a WeakBlock (like ice blocks) before the block was destroyed.
Added is_solid_block() method to WeakBlock to check its current state.
Modified Coin::collision to prevent collection if the coin's center is inside a solid WeakBlock.
Closes #3685