Proper fix for 2 handed idle animation#6109
Merged
serprex merged 1 commit intoHarbourMasters:develop-copperfrom Jan 8, 2026
Merged
Proper fix for 2 handed idle animation#6109serprex merged 1 commit intoHarbourMasters:develop-copperfrom
serprex merged 1 commit intoHarbourMasters:develop-copperfrom
Conversation
604bbc9 to
e4dc6ea
Compare
Closed
Contributor
|
@Jepvid can you verify this addresses purpose of your original PRs? |
Contributor
|
Imo is a cleaner implementation rather than moving the cvar in a sense. havent tested if it actually idles like the other pr |
serprex
approved these changes
Jan 8, 2026
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.
Upon further investigation, and thanks to the decomp
@bugcomment documenting the actual bug, the proper fix for 2 handed idle animation is more obvious. (and different than all of our attempts).TLDR:
( ( (commonType + FIDGET_SWORD_SWING != FIDGET_SWORD_SWING) && (commonType + FIDGET_SWORD_SWING != FIDGET_ADJUST_SHIELD) ) || ( (player->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) && ( (commonType + FIDGET_SWORD_SWING == FIDGET_ADJUST_SHIELD) || - (Player_GetMeleeWeaponHeld2(player) != 0) ) ) + || ( + (commonType + FIDGET_SWORD_SWING == FIDGET_SWORD_SWING) && + (Player_GetMeleeWeaponHeld(player) != 0) + ) )