mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-25 23:35:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document PLAYER_STATE1_SHIELDING (#2279)

Browse Source 
* Document `PLAYER_STATE1_SHIELDING`

* Fix format
This commit is contained in:
Pepe20129
2024-10-25 04:14:34 +02:00
committed by GitHub
parent 6ea3982695
commit 2c1d2d74bc
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_player_lib.c
+3 -3
View File
@@ -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);
}