diff options
| author | djevangelia <263709373+djevangelia@users.noreply.github.com> | 2026-08-06 21:08:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-06 19:08:23 +0000 |
| commit | a089fa60bac7c28f1dfcd1d570dea275fdb4bc62 (patch) | |
| tree | 040676068503c7776cddca5335ecad6bbc78c801 /soh/src | |
| parent | f5244973bd46edac7e750ea497cc6221224cfa1d (diff) | |
Restoration, hover fishing condition + XZ speed (#7031)
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/overlays/actors/ovl_player_actor/z_player.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 521dc3249..933e74203 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6598,17 +6598,20 @@ s32 func_8083C6B8(PlayState* play, Player* this) { rodCheckPos.y += 50.0f; - if (CVarGetInteger(CVAR_ENHANCEMENT("HoverFishing"), 0) - ? 0 - : !(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || (this->actor.world.pos.z > 1300.0f) || - BgCheck_SphVsFirstPoly(&play->colCtx, &rodCheckPos, 20.0f)) { + if (GameInteractor_Should(VB_NOT_CAST_FISHING, + (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || + (this->actor.world.pos.z > 1300.0f) || + BgCheck_SphVsFirstPoly(&play->colCtx, &rodCheckPos, 20.0f)), + &rodCheckPos)) { Sfx_PlaySfxCentered(NA_SE_SY_ERROR); return 0; } Player_SetupAction(play, this, Player_Action_80850C68, 0); this->unk_860 = 1; - Player_ZeroSpeedXZ(this); + if (GameInteractor_Should(VB_FISHING_ZERO_XZ, true)) { + Player_ZeroSpeedXZ(this); + } Player_AnimPlayOnce(play, this, &gPlayerAnim_link_fishing_throw); return 1; } else { |