mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-03 17:19:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

unsheathe without slashing (#6216)

Browse Source
This commit is contained in:
Jameriquiah
2026-02-27 21:34:56 -05:00
committed by GitHub
parent d46bfd9716
commit 9f56ef5090
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_player_actor/z_player.c
+4 -2
View File
@@ -2834,8 +2834,10 @@ s32 Player_UpperAction_Sword(Player* this, PlayState* play) {
s32 Player_UpperAction_ChangeHeldItem(Player* this, PlayState* play) {
if (LinkAnimation_Update(play, &this->upperSkelAnime) ||
((Player_ItemToItemAction(this->heldItemId) == this->heldItemAction) &&
(sUseHeldItem =
(sUseHeldItem || ((this->modelAnimType != PLAYER_ANIMTYPE_3) && (play->shootingGalleryStatus == 0)))))) {
(sUseHeldItem = (sUseHeldItem || GameInteractor_Should(VB_USE_HELD_ITEM_AFTER_CHANGE,
((this->modelAnimType != PLAYER_ANIMTYPE_3) &&
(play->shootingGalleryStatus == 0)),
this))))) {
Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]);
this->unk_834 = 0;
this->idleType = PLAYER_IDLE_DEFAULT;