diff options
| author | fig02 <fig02srl@gmail.com> | 2023-09-26 12:48:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 12:48:41 -0400 |
| commit | 2cb4ff4fd3d36157dd03d68321dbeb99ba5c6845 (patch) | |
| tree | 3fd5ee26441b24b6c226659b3dc4b55466d2cea9 /src/code/z_player_lib.c | |
| parent | 092f6026384b193df93a9836548bc788dec7c81c (diff) | |
Player Docs: csMode -> csAction (#1547)
* csmode -> cs action
* format
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 57fdfd532..a14934d2c 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -488,7 +488,7 @@ void Player_SetBootData(PlayState* play, Player* this) { } s32 Player_InBlockingCsMode(PlayState* play, Player* this) { - return (this->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (this->csMode != PLAYER_CSMODE_NONE) || + return (this->stateFlags1 & (PLAYER_STATE1_7 | PLAYER_STATE1_29)) || (this->csAction != PLAYER_CSACTION_NONE) || (play->transitionTrigger == TRANS_TRIGGER_START) || (this->stateFlags1 & PLAYER_STATE1_0) || (this->stateFlags3 & PLAYER_STATE3_7) || ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0)); @@ -578,7 +578,7 @@ void func_8008EC70(Player* this) { } void Player_SetEquipmentData(PlayState* play, Player* this) { - if (this->csMode != PLAYER_CSMODE_86) { + if (this->csAction != PLAYER_CSACTION_86) { this->currentShield = SHIELD_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD)); this->currentTunic = TUNIC_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC)); this->currentBoots = BOOTS_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS)); |