From b84e27c732ac9160850fd057c01ae04f71fb4c2d Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Thu, 28 Nov 2024 04:33:13 +1100 Subject: Name Remaining Hookshot Actor Flags (#1746) * hookshot attachment * period * hookshot flags * fix ordering * comment, fix ordering --------- Co-authored-by: Anghelo Carvajal --- src/code/z_player_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code') diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index ce3ba3c87..85bc4aae6 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -647,7 +647,7 @@ bool Player_InBlockingCsMode(PlayState* play, Player* player) { return (player->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_200 | PLAYER_STATE1_20000000)) || (player->csAction != PLAYER_CSACTION_NONE) || (play->transitionTrigger == TRANS_TRIGGER_START) || (play->transitionMode != TRANS_MODE_OFF) || (player->stateFlags1 & PLAYER_STATE1_1) || - (player->stateFlags3 & PLAYER_STATE3_80) || play->actorCtx.isOverrideInputOn; + (player->stateFlags3 & PLAYER_STATE3_FLYING_WITH_HOOKSHOT) || play->actorCtx.isOverrideInputOn; } bool Player_InCsMode(PlayState* play) { -- cgit v1.2.3