diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-10-17 00:13:25 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-16 06:13:25 -0700 |
| commit | 5dd43102851bf69bb091ef1fc7d1443aa98d56a1 (patch) | |
| tree | 179576ed6384725288fafb262cc4599446bbb5ea /src/code/z_camera.c | |
| parent | 4a3f9b0f6bc8ffb531799ad1587283e05295f04b (diff) | |
Animation Cleanup: En_V* and En_W* (#1713)
* begin anim v and w
* structs
* bgId
* cleanup
* space
* more cleanup
* spacing
* Unsigned
Diffstat (limited to 'src/code/z_camera.c')
| -rw-r--r-- | src/code/z_camera.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 143a003db..72e056124 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -558,8 +558,8 @@ s32 func_800CBC84(Camera* camera, Vec3f* from, CameraCollision* to, s32 arg3) { toPoint.y = to->pos.y + fromToNorm.y; toPoint.z = to->pos.z + fromToNorm.z; - if (!BgCheck_CameraLineTest1(colCtx, from, &toPoint, &toNewPos, &to->poly, (arg3 & 1) ? 0 : 1, 1, - (arg3 & 2) ? 0 : 1, -1, &floorBgId)) { + if (!BgCheck_CameraLineTest1(colCtx, from, &toPoint, &toNewPos, &to->poly, (arg3 & 1) ? false : true, true, + (arg3 & 2) ? false : true, -1, &floorBgId)) { toNewPos = to->pos; toNewPos.y += 5.0f; @@ -618,7 +618,8 @@ s32 Camera_BgCheckInfo(Camera* camera, Vec3f* from, CameraCollision* to) { Vec3f toNewPos; Vec3f fromToNorm; - if (BgCheck_CameraLineTest1(&camera->play->colCtx, from, &to->pos, &toNewPos, &to->poly, 1, 1, 1, -1, &to->bgId)) { + if (BgCheck_CameraLineTest1(&camera->play->colCtx, from, &to->pos, &toNewPos, &to->poly, true, true, true, -1, + &to->bgId)) { floorPoly = to->poly; to->norm.x = COLPOLY_GET_NORMAL(floorPoly->normal.x); to->norm.y = COLPOLY_GET_NORMAL(floorPoly->normal.y); @@ -665,7 +666,7 @@ s32 Camera_CheckOOB(Camera* camera, Vec3f* from, Vec3f* to) { CollisionContext* colCtx = &camera->play->colCtx; poly = NULL; - if ((BgCheck_CameraLineTest1(colCtx, from, to, &intersect, &poly, 1, 1, 1, 0, &bgId)) && + if (BgCheck_CameraLineTest1(colCtx, from, to, &intersect, &poly, true, true, true, 0, &bgId) && (CollisionPoly_GetPointDistanceFromPlane(poly, from) < 0.0f)) { return true; } |
