mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

Remove many redundant parentheses (eg. in boolean conditions) (#1220)

Browse source 
* 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>
This commit is contained in:
Roman971 2022-05-12 15:04:37 +02:00 • committed by GitHub
parent c799176a30
commit 92aef346f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
View file

@ -131,7 +131,7 @@ void EffectSsEnFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this)
Matrix_RotateX(BINANG_TO_RAD(this->rPitch + this->actor->shape.rot.x), MTXMODE_APPLY);
Matrix_MultVec3f(&this->vec, &this->pos);
} else {
if ((this->rFlags & 0x8000)) {
if (this->rFlags & 0x8000) {
this->pos.x = ((FireActorS*)this->actor)->firePos[this->rBodyPart].x;
this->pos.y = ((FireActorS*)this->actor)->firePos[this->rBodyPart].y;
this->pos.z = ((FireActorS*)this->actor)->firePos[this->rBodyPart].z;

2
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View file

@ -137,7 +137,7 @@ void EffectSsEnIce_UpdateFlying(GlobalContext* globalCtx, u32 index, EffectSs* t
s16 rand;
if ((this->actor != NULL) && (this->actor->update != NULL)) {
if ((this->life >= 9) && (this->actor->colorFilterTimer != 0) && (!(this->actor->colorFilterParams & 0xC000))) {
if ((this->life >= 9) && (this->actor->colorFilterTimer != 0) && !(this->actor->colorFilterParams & 0xC000)) {
this->pos.x = this->actor->world.pos.x + this->vec.x;
this->pos.y = this->actor->world.pos.y + this->vec.y;
this->pos.z = this->actor->world.pos.z + this->vec.z;