diff options
| author | KrimtonZ <krimtonz@gmail.com> | 2020-03-24 11:56:37 -0500 |
|---|---|---|
| committer | KrimtonZ <krimtonz@gmail.com> | 2020-03-24 11:56:37 -0500 |
| commit | 8bbac143cd9a101b2cdd2c80f3531d5cc104ca8a (patch) | |
| tree | 3b9aae76ff4e5200884f593d2db69254d9709c3f /src/code/z_camera.c | |
| parent | ac4a51bf8fdc93221d4ba674351b683d0eedfd9b (diff) | |
| parent | 4eb7f023f348151fb73f4a0850a6f348280d7805 (diff) | |
Merge branch 'master' into skelanime
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index d7b0108d5..b48b58321 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -224,8 +224,9 @@ s32 func_800443A0(Camera* camera, Vec3f* b, Vec3f* c) { sp34 = NULL; // this is moved to the top when it should be done in the middle of the function args being loaded if (func_8003DD6C(&camera->globalCtx->colCtx, b, c, &sp40, &sp34, 1, 1, 1, 0, &sp38) != 0) { - if (func_80038B7C(sp34, b) < 0.0f) + if (func_80038B7C(sp34, b) < 0.0f) { return 1; + } } return 0; } @@ -461,18 +462,20 @@ s32 func_800458D4(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 e) { sp60.z = 0.0f; temp_s1 = &camera->unk_94; - if (e != 0) + if (e != 0) { sp60.y -= func_80045714(&camera->unk_108, temp_s1->rot.y, b->unk_06, OREG(9)); + } sp48 = temp_s1->pos.y - *d; temp_ret = Math_atan2f(sp48, func_8007C028(&camera->unk_50, &camera->unk_5C)); // f2 and f14 are swapped - if (OREG(32) * (M_PI / 180) < temp_ret) + if (OREG(32) * (M_PI / 180) < temp_ret) { phi_f2 = 1.0f - sinf(temp_ret - OREG(32) * (M_PI / 180)); - else if (OREG(33) * (M_PI / 180) > temp_ret) + } else if (OREG(33) * (M_PI / 180) > temp_ret) { phi_f2 = 1.0f - sinf(OREG(33) * (M_PI / 180) - temp_ret); - else + } else { phi_f2 = 1.0f; + } sp60.y -= sp48 * phi_f2; func_80043A3C(&sp60, &camera->unk_E4, OREG(29) * 0.01f, OREG(30) * 0.01f, 0.1f); @@ -520,7 +523,7 @@ s32 func_80045B08(Camera* camera, struct_80045714* b, f32 c, s16 d) { return 1; } -#ifdef NON_MATCHING +/* // someone who's not me can have fun with this function s32 func_80045C74(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 arg4) { Vec3f sp70; @@ -593,9 +596,8 @@ s32 func_80045C74(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 arg4) { return 1; } -#else +*/ #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045C74.s") -#endif // 421 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800460A8.s") |