TD & Mine animation fix (proposed) - #592
Draft
jerethk wants to merge 2 commits into
Draft
Conversation
…l the throw is complete It appears that lines 1023-1026 may have been added as a temporary hack in commit 0c0ff97
…ed with no ammo The final else block may have been accidentally missed
jerethk
marked this pull request as draft
July 2, 2026 15:02
jerethk
marked this pull request as ready for review
July 3, 2026 17:22
ifeldshteyn
reviewed
Jul 10, 2026
|
|
||
| const u8* atten = RClassic_Fixed::computeLighting(weaponLightingZDist, 0); | ||
| TextureData* tex = weapon->frames[weapon->frame]; | ||
| if (weapon->ammo && *weapon->ammo == 0 && (weapon->ammo == &s_playerInfo.ammoDetonator || weapon->ammo == &s_playerInfo.ammoMine)) |
Collaborator
There was a problem hiding this comment.
Isn't this code to reset to Fist if you are out of ammo? @jerethk
Collaborator
Author
There was a problem hiding this comment.
I have a feeling Lucius may have added it as a temporary hack.
It doesn't give correct behaviour.
Look closely as you throw the last TD or mine in your inventory. The mine/TD vanishes incorrectly as soon as you start the action, rather than when the action is finished
Collaborator
There was a problem hiding this comment.
I remember this bug - so does this code removal fixes it?
Collaborator
Author
There was a problem hiding this comment.
The change as a whole fixes it - question is, whether it is true to the RE
jerethk
marked this pull request as draft
July 10, 2026 04:06
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
3 participants
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 is a subtle bug that has been present since the early days - it is seen when you use your final TD or mine.
@luciusDXL could you please compare with your original RE code?
I have reasoned out a fix which seems to give correct behaviour (cf. DOS), but I don't have access to the original code to check it. - thanks
It would be ideal if we can match the original code.