mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-07 11:57:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name Remaining Hookshot Actor Flags (#1746)

Browse Source 
* hookshot attachment

* period

* hookshot flags

* fix ordering

* comment, fix ordering

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
engineer124
2024-11-28 04:33:13 +11:00
committed by GitHub
parent 2f1f0bdaef
commit b84e27c732
45 changed files with 156 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_player_lib.c
+1 -1
View File
@@ -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) {