diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-03-23 22:04:07 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-23 08:04:07 -0300 |
| commit | 5bef89a6ff33c3e84ad58d201bd1996a0d9f7db4 (patch) | |
| tree | 39cc7a06f0ea32f31ab88096e7da179ceeef7571 /src/code/z_camera.c | |
| parent | a7fa8cc241d7f6e08d3744644cf8e93599f190a0 (diff) | |
Misc Cleanup 2 (#1521)
* begin cleanup
* more cleanup
* more cleanup
* more cleanup
* more cleanup
* more cleanup
* fake matches
* more cleanup
* more cleanup
* small thing
* PR Review
* PR Review
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 5e04f1613..d33864f34 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1075,7 +1075,7 @@ Vec3f Camera_CalcUpVec(s16 pitch, s16 yaw, s16 roll) { Vec3f rollMtxRow1; Vec3f rollMtxRow2; Vec3f rollMtxRow3; - f32 pad; + s32 pad; // Axis to roll around u.x = cosP * sinY; @@ -1391,7 +1391,7 @@ s32 Camera_CalcAtForNormal1(Camera* camera, VecGeo* arg1, f32 yOffset, f32 forwa */ s32 Camera_CalcAtForParallel(Camera* camera, VecGeo* arg1, f32 yOffset, f32 xzOffsetMax, f32* focalActorPosY, s16 flags) { - f32 pad; + s32 pad; Vec3f focalActorAtOffsetTarget; Vec3f atTarget; f32 fovHeight; @@ -2477,9 +2477,7 @@ s32 Camera_Normal3(Camera* camera) { sp62 = BINANG_SUB(focalActorPosRot->rot.y, BINANG_ROT180(sp68.yaw)); sp78 = OLib_Vec3fToVecGeo(&camera->unk_0F0); phi_v1_2 = focalActorPosRot->rot.y - sp78.yaw; - if (phi_v1_2 < 0) { - phi_v1_2 *= -1; - } + phi_v1_2 = ABS_ALT(phi_v1_2); if (phi_v1_2 < 0x555A) { temp_f2 = 1.0f; @@ -3299,7 +3297,7 @@ s32 Camera_Jump3(Camera* camera) { f32 phi_f2_2; f32 temp_f0; f32 temp1; - f32 pad; + s32 pad; Jump3ReadOnlyData* roData = &camera->paramData.jump3.roData; Jump3ReadWriteData* rwData = &camera->paramData.jump3.rwData; f32 focalActorHeight = Camera_GetFocalActorHeight(camera); |