diff options
| author | Pepe20129 <72659707+Pepe20129@users.noreply.github.com> | 2024-10-25 04:14:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 22:14:34 -0400 |
| commit | 2c1d2d74bc19c7c5671d866eb7b0e754fa099c28 (patch) | |
| tree | 83e39116f11205aafa853a63c101d6f514028303 /src/code | |
| parent | 6ea3982695e00eb5c05369601dc5ca9533b9b956 (diff) | |
Document `PLAYER_STATE1_SHIELDING` (#2279)
* Document `PLAYER_STATE1_SHIELDING`
* Fix format
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_player_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 114987864..798ba8246 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -644,7 +644,7 @@ s32 Player_ActionToModelGroup(Player* this, s32 itemAction) { } void Player_SetModelsForHoldingShield(Player* this) { - if ((this->stateFlags1 & PLAYER_STATE1_22) && + if ((this->stateFlags1 & PLAYER_STATE1_SHIELDING) && ((this->itemAction < 0) || (this->itemAction == this->heldItemAction))) { if (!Player_HoldsTwoHandedWeapon(this) && !Player_IsChildWithHylianShield(this)) { this->rightHandType = PLAYER_MODELTYPE_RH_SHIELD; @@ -1460,7 +1460,7 @@ void Player_UpdateShieldCollider(PlayState* play, Player* this, ColliderQuad* co COL_MATERIAL_METAL, }; - if (this->stateFlags1 & PLAYER_STATE1_22) { + if (this->stateFlags1 & PLAYER_STATE1_SHIELDING) { Vec3f quadDest[4]; this->shieldQuad.base.colMaterial = shieldColMaterials[this->currentShield]; @@ -1494,7 +1494,7 @@ void func_800906D4(PlayState* play, Player* this, Vec3f* newTipPos) { Matrix_MultVec3f(&D_801260A4[2], &newBasePos[2]); if (func_80090480(play, NULL, &this->meleeWeaponInfo[0], &newTipPos[0], &newBasePos[0]) && - !(this->stateFlags1 & PLAYER_STATE1_22)) { + !(this->stateFlags1 & PLAYER_STATE1_SHIELDING)) { EffectBlure_AddVertex(Effect_GetByIndex(this->meleeWeaponEffectIndex), &this->meleeWeaponInfo[0].tip, &this->meleeWeaponInfo[0].base); } |