diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-18 00:49:23 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 10:49:23 -0300 |
| commit | dbb6410ba3a1b756a0ee073d3e1445db494b9f85 (patch) | |
| tree | d92a81c6511e9fa5c818dc532dc15ae7057a8be6 /src/code | |
| parent | 8ab62788b2ad7d8f5c2b556b2416f06c29b6f5be (diff) | |
Animation Cleanup: En_M* (#1496)
* brackets
* more M cleanup
* small cleanup
* PR Review
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_player_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 24b9907ce..1e4ee1672 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -358,9 +358,9 @@ s32 Player_GetCurMaskItemId(PlayState* play) { void func_80122F28(Player* player) { if ((player->actor.category == ACTORCAT_PLAYER) && - (!(player->stateFlags1 & (PLAYER_STATE1_400 | PLAYER_STATE1_800 | PLAYER_STATE1_200000 | PLAYER_STATE1_800000 | - PLAYER_STATE1_20000000))) && - (!(player->stateFlags2 & PLAYER_STATE2_1))) { + !(player->stateFlags1 & (PLAYER_STATE1_400 | PLAYER_STATE1_800 | PLAYER_STATE1_200000 | PLAYER_STATE1_800000 | + PLAYER_STATE1_20000000)) && + !(player->stateFlags2 & PLAYER_STATE2_1)) { if (player->doorType <= PLAYER_DOORTYPE_TALKING) { CutsceneManager_Queue(CS_ID_GLOBAL_TALK); } else { @@ -2272,7 +2272,7 @@ s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx** } } } else if ((player->rightHandType == PLAYER_MODELTYPE_RH_OPEN) && (player->actor.speed > 2.0f) && - (!(player->stateFlags1 & PLAYER_STATE1_8000000))) { + !(player->stateFlags1 & PLAYER_STATE1_8000000)) { rightHandDLists = &gPlayerRightHandClosedDLs[D_801F59E0]; sPlayerRightHandType = PLAYER_MODELTYPE_RH_CLOSED; } else { @@ -2562,7 +2562,7 @@ void func_8012669C(PlayState* play, Player* player, Vec3f* arg2, Vec3f* arg3) { if (player->meleeWeaponState != PLAYER_MELEE_WEAPON_STATE_0) { if (func_80126440(play, NULL, &player->meleeWeaponInfo[0], &sp3C, &sp30) && - (player->transformation != PLAYER_FORM_GORON) && (!(player->stateFlags1 & PLAYER_STATE1_400000))) { + (player->transformation != PLAYER_FORM_GORON) && !(player->stateFlags1 & PLAYER_STATE1_400000)) { EffectBlure_AddVertex(Effect_GetByIndex(player->meleeWeaponEffectIndex[0]), &player->meleeWeaponInfo[0].tip, &player->meleeWeaponInfo[0].base); } |