diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-11-28 04:33:13 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 14:33:13 -0300 |
| commit | b84e27c732ac9160850fd057c01ae04f71fb4c2d (patch) | |
| tree | 65f57787a535e4dda06efacac6415d4ae7573d06 /src/code/z_player_lib.c | |
| parent | 2f1f0bdaefd63cf7da0598b988b6d4415c206071 (diff) | |
Name Remaining Hookshot Actor Flags (#1746)
* hookshot attachment
* period
* hookshot flags
* fix ordering
* comment, fix ordering
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |