mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-26 17:51:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use more TRUNCF_BINANG for f32 -> s16 casts (#1503)

Browse Source 
* TRUNCF_BINANG

* brackets

* extra cast
This commit is contained in:
engineer124
2023-12-13 15:16:24 +11:00
committed by GitHub
parent ed4da0ecef
commit 5607eec18b
127 changed files with 387 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_bgcheck.c
+3 -3
View File
@@ -3570,17 +3570,17 @@ s32 BgCheck_SphVsDynaWall(CollisionContext* colCtx, u16 xpFlags, f32* outX, f32*
continue;
}
bgActor->boundingSphere.radius += (s16)radius;
bgActor->boundingSphere.radius += TRUNCF_BINANG(radius);
r = bgActor->boundingSphere.radius;
dx = bgActor->boundingSphere.center.x - resultPos.x;
dz = bgActor->boundingSphere.center.z - resultPos.z;
if ((SQ(r) < SQ(dx) + SQ(dz)) || (!Math3D_XYInSphere(&bgActor->boundingSphere, resultPos.x, resultPos.y) &&
!Math3D_YZInSphere(&bgActor->boundingSphere, resultPos.y, resultPos.z))) {
bgActor->boundingSphere.radius -= (s16)radius;
bgActor->boundingSphere.radius -= TRUNCF_BINANG(radius);
continue;
}
bgActor->boundingSphere.radius -= (s16)radius;
bgActor->boundingSphere.radius -= TRUNCF_BINANG(radius);
if (BgCheck_SphVsDynaWallInBgActor(colCtx, xpFlags, &colCtx->dyna,
&(colCtx->dyna.bgActors + i)->dynaLookup.wall, outX, outZ, outPoly, outBgId,
&resultPos, radius, i, actor)) {