mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 06:41:52 -05:00
Code Issues Projects Releases Wiki Activity

fix dark link softlock (#5027)

Browse Source
This commit is contained in:
briaguya 2025-02-09 08:49:56 -08:00 committed by GitHub
parent 0177690b54
commit 29cecd8502
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
soh/soh/Enhancements/AssignableTunicsAndBoots.cpp
View File

@ -94,10 +94,19 @@ void RegisterAssignableTunicsBoots() {
return; return;
} }
Input* input = va_arg(args, Input*); Player* player = va_arg(args, Player*);
Player* player = GET_PLAYER(gPlayState);
// if we're not dealing with the actual player, we're probably
// dealing with dark link, don't do any tunics/boots stuff, just
// run the vanilla action func
if (player->actor.id != ACTOR_PLAYER) {
return;
}
*should = false; *should = false;
Input* input = va_arg(args, Input*);
player->actionFunc(player, gPlayState); player->actionFunc(player, gPlayState);
UseTunicBoots(player, gPlayState, input); UseTunicBoots(player, gPlayState, input);
}); });

1
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
View File

@ -398,6 +398,7 @@ typedef enum {
// !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC) // !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC)
// ``` // ```
// #### `args` // #### `args`
// - `*Player`
// - `*Input` // - `*Input`
VB_EXECUTE_PLAYER_ACTION_FUNC, VB_EXECUTE_PLAYER_ACTION_FUNC,

2
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -12166,7 +12166,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
sUseHeldItem = sHeldItemButtonIsHeldDown = 0; sUseHeldItem = sHeldItemButtonIsHeldDown = 0;
sSavedCurrentMask = this->currentMask; sSavedCurrentMask = this->currentMask;
if (GameInteractor_Should(VB_EXECUTE_PLAYER_ACTION_FUNC, !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC), input)) { if (GameInteractor_Should(VB_EXECUTE_PLAYER_ACTION_FUNC, !(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC), this, input)) {
this->actionFunc(this, play); this->actionFunc(this, play);
} }