Skip to content

Commit ede7dfa

Browse files
MegaMechgithub-actions[bot]
authored andcommitted
Clang Format
1 parent b8823f1 commit ede7dfa

File tree

35 files changed

+599
-494
lines changed

35 files changed

+599
-494
lines changed

include/PR/abi.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,13 @@ typedef short ENVMIX_STATE[40];
822822
/*
823823
* See aEnvMixer for more info.
824824
*/
825-
#define aEnvSetup1Alt(pkt,initialVolReverb,rampReverbL,rampReverbR,rampLeft,rampRight) { Acmd *_a = (Acmd *)pkt; _a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | _SHIFTL(initialVolReverb, 16, 8) | (_SHIFTL(rampReverbL, 8, 8)) | _SHIFTL(rampReverbR, 0, 8)); _a->words.w1 = _SHIFTL(rampLeft, 16, 16) | _SHIFTL(rampRight, 0, 16); }
825+
#define aEnvSetup1Alt(pkt, initialVolReverb, rampReverbL, rampReverbR, rampLeft, rampRight) \
826+
{ \
827+
Acmd* _a = (Acmd*) pkt; \
828+
_a->words.w0 = (_SHIFTL(A_ENVSETUP1, 24, 8) | _SHIFTL(initialVolReverb, 16, 8) | \
829+
(_SHIFTL(rampReverbL, 8, 8)) | _SHIFTL(rampReverbR, 0, 8)); \
830+
_a->words.w1 = _SHIFTL(rampLeft, 16, 16) | _SHIFTL(rampRight, 0, 16); \
831+
}
826832

827833
/*
828834
* See aEnvMixer for more info.

include/defines.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373

7474
// Float version required for matching
7575
#ifdef VERSION_EU
76-
#define COURSE_TIMER_ITER 0.020041665999999999 // 1 / 50
77-
#ifdef AVOID_UB
78-
#define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
79-
#else
80-
#define COURSE_TIMER_ITER_f 0.01666666f //! 1 / 60 - Float unchanged in EU
81-
#endif
76+
#define COURSE_TIMER_ITER 0.020041665999999999 // 1 / 50
77+
#ifdef AVOID_UB
78+
#define COURSE_TIMER_ITER_f 0.020041665999999999f // 1 / 50
79+
#else
80+
#define COURSE_TIMER_ITER_f 0.01666666f //! 1 / 60 - Float unchanged in EU
81+
#endif
8282
#else
8383
#define COURSE_TIMER_ITER 0.01666666 // 1 / 60
8484
#define COURSE_TIMER_ITER_f 0.01666666f // 1 / 60
@@ -369,7 +369,6 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
369369
#define LIGHTNING_EFFECT 0x40000000 // being hit by lightning
370370
#define BOO_EFFECT 0x80000000 // being a boo
371371

372-
373372
/**
374373
* @brief durations of effects
375374
*/

src/actors/blue_and_red_shells/update.inc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ s16 func_802B3FD0(Player* owner, struct ShellActor* shell) {
172172
if (gPlayerBalloonCount[playerIndex] < 0) {
173173
continue;
174174
}
175-
// dist_squared_bugged is not quite a 3D distance function, it doubles (rather than squares) the Z difference of the
176-
// positions
175+
// dist_squared_bugged is not quite a 3D distance function, it doubles (rather than squares) the Z difference of
176+
// the positions
177177
playerToShellDistance = dist_squared_bugged(player->pos, shell->pos);
178178
if (playerToShellDistance < smallestDistance) {
179179
smallestDistance = playerToShellDistance;

src/actors/cow/render.inc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
* @param arg2
1414
*/
1515
void render_actor_cow(Camera* camera, Mat4 arg1, struct Actor* arg2) {
16-
if (distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1],
17-
4000000.0f) < 0) {
16+
if (distance_if_visible(camera->pos, arg2->pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 4000000.0f) < 0) {
1817
return;
1918
}
2019

src/actors/fake_item_box/render.inc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox)
2525
f32 someMultiplier;
2626

2727
if (distance_if_visible(camera->pos, fakeItemBox->pos, camera->rot[1], 2500.0f, gCameraZoom[camera - camera1],
28-
1000000.0f) < 0) {
28+
1000000.0f) < 0) {
2929
actor_not_rendered(camera, (struct Actor*) fakeItemBox);
3030
return;
3131
}

src/actors/falling_rock/render.inc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ void render_actor_falling_rock(Camera* camera, struct FallingRock* rock) {
2020
return;
2121
}
2222

23-
height = distance_if_visible(camera->pos, rock->pos, camera->rot[1], 400.0f, gCameraZoom[camera - camera1],
24-
4000000.0f);
23+
height =
24+
distance_if_visible(camera->pos, rock->pos, camera->rot[1], 400.0f, gCameraZoom[camera - camera1], 4000000.0f);
2525

2626
if (height < 0.0f) {
2727
return;

src/actors/item_box/render.inc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) {
2727
f32 someMultiplier;
2828

2929
temp_f0 = distance_if_visible(camera->pos, item_box->pos, camera->rot[1], 0.0f, gCameraZoom[camera - camera1],
30-
4000000.0f);
30+
4000000.0f);
3131
if (!(temp_f0 < 0.0f) && !(600000.0f < temp_f0)) {
3232
if ((item_box->state == 2) && (temp_f0 < 100000.0f)) {
3333
someRot[0] = 0;

src/actors/paddle_boat/render.inc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ void render_actor_paddle_boat(Camera* arg0, struct PaddleWheelBoat* boat, UNUSED
2828
return;
2929
}
3030

31-
temp =
32-
distance_if_visible(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f);
31+
temp = distance_if_visible(arg0->pos, boat->pos, arg0->rot[1], 90000.0f, gCameraZoom[arg0 - camera1], 9000000.0f);
3332

3433
if (temp < 0.0f) {
3534
return;

src/actors/palm_tree/render.inc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ void render_actor_palm_tree(Camera* arg0, UNUSED Mat4 arg1, struct PalmTree* arg
2020
return;
2121
}
2222

23-
temp_f0 =
24-
distance_if_visible(arg0->pos, arg2->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], 4000000.0f);
23+
temp_f0 = distance_if_visible(arg0->pos, arg2->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], 4000000.0f);
2524

2625
if (!(temp_f0 < 0.0f)) {
2726
if (((temp_v0 & 0x400) == 0) && (temp_f0 < 250000.0f)) {

src/actors/railroad_crossing/render.inc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
void render_actor_railroad_crossing(Camera* arg0, struct RailroadCrossing* rr_crossing) {
1414
UNUSED Vec3s sp80 = { 0, 0, 0 };
1515
Mat4 sp40;
16-
f32 unk = distance_if_visible(arg0->pos, rr_crossing->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1],
17-
4000000.0f);
16+
f32 unk =
17+
distance_if_visible(arg0->pos, rr_crossing->pos, arg0->rot[1], 0.0f, gCameraZoom[arg0 - camera1], 4000000.0f);
1818

1919
if (!(unk < 0.0f)) {
2020
mtxf_rotate_zxy_translate(sp40, rr_crossing->pos, rr_crossing->rot);

0 commit comments

Comments
 (0)