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

Run formatter

Browse source
This commit is contained in:
Dragorn421 2021-09-21 11:18:44 +02:00
parent 843161b811
commit 4a172b7941
No known key found for this signature in database
GPG key ID: C182A3A3996E8201
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Butte/z_en_butte.c
View file

@ -271,7 +271,8 @@ void EnButte_FlyAround(EnButte* this, GlobalContext* globalCtx) {
EnButte_SelectFlightParams(this, &sFlyAroundParams[this->flightParamsIdx]);
}
if (((this->actor.params & 1) == 1) && (player->heldItemActionParam == PLAYER_AP_STICK) && (this->swordDownTimer <= 0) &&
if (((this->actor.params & 1) == 1) && (player->heldItemActionParam == PLAYER_AP_STICK) &&
(this->swordDownTimer <= 0) &&
((Math3D_Dist2DSq(player->actor.world.pos.x, player->actor.world.pos.z, this->actor.home.pos.x,
this->actor.home.pos.z) < SQ(120.0f)) ||
(this->actor.xzDistToPlayer < 60.0f))) {
@ -336,8 +337,8 @@ void EnButte_FollowLink(EnButte* this, GlobalContext* globalCtx) {
distSqFromHome = Math3D_Dist2DSq(this->actor.world.pos.x, this->actor.world.pos.z, this->actor.home.pos.x,
this->actor.home.pos.z);
if (!((player->heldItemActionParam == PLAYER_AP_STICK) && (fabsf(player->actor.speedXZ) < 1.8f) && (this->swordDownTimer <= 0) &&
(distSqFromHome < SQ(320.0f)))) {
if (!((player->heldItemActionParam == PLAYER_AP_STICK) && (fabsf(player->actor.speedXZ) < 1.8f) &&
(this->swordDownTimer <= 0) && (distSqFromHome < SQ(320.0f)))) {
EnButte_SetupFlyAround(this);
} else if (distSqFromHome > SQ(240.0f)) {
distSqFromSword = Math3D_Dist2DSq(player->swordInfo[0].tip.x, player->swordInfo[0].tip.z,

3
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
View file

@ -626,7 +626,8 @@ s32 func_809F7D50(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
Vec3f D_809F7F64 = { 480.0f, 620.0f, 0.0f };
if (limbIndex == 1) {
Matrix_Scale((this->rootScale * 0.5f) + 1.0f, this->rootScale + 1.0f, (this->rootScale * 0.5f) + 1.0f, MTXMODE_APPLY);
Matrix_Scale((this->rootScale * 0.5f) + 1.0f, this->rootScale + 1.0f, (this->rootScale * 0.5f) + 1.0f,
MTXMODE_APPLY);
}
if (limbIndex == 4) {

2
src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
View file

@ -578,7 +578,7 @@ void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx2) {
input->cur.button = ((sCounterState == 0) && (this->swordState == 0)) ? BTN_R : input->cur.button ^ BTN_R;
}
input->rel.button = input->prev.button & pad54;
input->prev.button = input->cur.button & (u16)~(BTN_A | BTN_B);
input->prev.button = input->cur.button & (u16) ~(BTN_A | BTN_B);
PadUtils_UpdateRelXY(input);
input->press.stick_x += (s8)(input->cur.stick_x - input->prev.stick_x);