diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2022-05-12 15:04:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 09:04:37 -0400 |
| commit | 92aef346f2bd7167b892beddafd0959801df0e3c (patch) | |
| tree | bdaed9512cab3ebdd3ecee4961688c86a8fbab67 /src/code/z_camera.c | |
| parent | c799176a30c5a1389c720bdfcdf4c1c9f3b07b32 (diff) | |
Remove many redundant parentheses (eg. in boolean conditions) (#1220)
* Remove many unnecessary parens around boolean conditions
* Remove duplicate parens in some expressions
* Apply review suggestions
* Update src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 6f72e8868..33b377aeb 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1604,7 +1604,7 @@ s32 Camera_Normal1(Camera* camera) { } Camera_Vec3fVecSphGeoAdd(eyeNext, at, &eyeAdjustment); - if ((camera->status == CAM_STAT_ACTIVE) && (!(roData->interfaceFlags & 0x10))) { + if ((camera->status == CAM_STAT_ACTIVE) && !(roData->interfaceFlags & 0x10)) { rwData->swingYawTarget = BINANG_ROT180(camera->playerPosRot.rot.y); if (rwData->startSwingTimer > 0) { func_80046E20(camera, &eyeAdjustment, roData->distMin, roData->unk_0C, &sp98, &rwData->swing); @@ -4881,7 +4881,7 @@ s32 Camera_Unique0(Camera* camera) { if (rwData->animTimer > 0) { rwData->animTimer--; rwData->initalPos = playerPosRot->pos; - } else if ((!(player->stateFlags1 & PLAYER_STATE1_29)) && + } else if (!(player->stateFlags1 & PLAYER_STATE1_29) && ((OLib_Vec3fDistXZ(&playerPosRot->pos, &rwData->initalPos) >= 10.0f) || CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_A) || CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_B) || @@ -4909,7 +4909,7 @@ s32 Camera_Unique0(Camera* camera) { rwData->initalPos = playerPosRot->pos; } - if ((!(player->stateFlags1 & PLAYER_STATE1_29)) && + if (!(player->stateFlags1 & PLAYER_STATE1_29) && ((0.001f < camera->xzSpeed) || CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_A) || CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_B) || CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_CLEFT) || @@ -7444,7 +7444,7 @@ Vec3s Camera_Update(Camera* camera) { camera->nextCamDataIdx = -1; } - if ((camera->unk_14C & 1) && (camera->unk_14C & 4) && (!(camera->unk_14C & 0x400)) && + if ((camera->unk_14C & 1) && (camera->unk_14C & 4) && !(camera->unk_14C & 0x400) && (!(camera->unk_14C & 0x200) || (player->currentBoots == PLAYER_BOOTS_IRON)) && (!(camera->unk_14C & (s16)0x8000)) && (playerGroundY != BGCHECK_Y_MIN)) { camDataIdx = Camera_GetDataIdxForPoly(camera, &bgId, playerFloorPoly); @@ -7833,7 +7833,7 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) { return -99; } - if ((setting == camera->setting) && (!(flags & 1))) { + if ((setting == camera->setting) && !(flags & 1)) { camera->unk_14A |= 0x10; if (!(flags & 2)) { camera->unk_14A |= 1; |