diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-09-16 09:01:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-16 09:01:55 -0600 |
| commit | 60ac50c9628d25968bfe367e1b4b6f030078be64 (patch) | |
| tree | e03a0d825cfe443adcf076cb643c20692151f431 /src/code_80086E70.c | |
| parent | 7adfdaa9abb18d76ae80f26bff58c2c4dc4f3f29 (diff) | |
| parent | 8fb42e50d70356300050048b57def3123e6d4552 (diff) | |
Merge branch 'main' into Caladius-patch-1Caladius-patch-1
Diffstat (limited to 'src/code_80086E70.c')
| -rw-r--r-- | src/code_80086E70.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 2e6ecd04d..b927d5f17 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1311,7 +1311,7 @@ void func_8008A1D0(s32 objectIndex, s32 cameraId, s32 arg2, s32 arg3) { clear_object_flag(objectIndex, 0x00100000 | VISIBLE); temp_v0 = get_horizontal_distance_to_camera(objectIndex, camera); if (CVarGetInteger("gNoCulling", 0) == 1) { - temp_v0 = MIN(temp_v0, arg3 * arg3); + temp_v0 = MIN(temp_v0, (u32) (arg3 * arg3)); } if (temp_v0 < 0x2711U) { var_a2 = 0x5555; @@ -1357,9 +1357,9 @@ s32 func_8008A364(s32 objectIndex, s32 cameraId, u16 arg2, s32 arg3) { clear_object_flag(objectIndex, 0x00020000 | VISIBLE); dist = get_horizontal_distance_to_camera(objectIndex, camera); if (CVarGetInteger("gNoCulling", 0) == 1) { - dist = MIN(dist, (arg3 * arg3) - 1); + dist = MIN(dist, (u32) ((arg3 * arg3) - 1)); } - if (dist < (arg3 * arg3)) { + if (dist < (u32) (arg3 * arg3)) { set_object_flag(objectIndex, 0x00020000); if (dist < 0x2711U) { var_a2 = 0x5555; |