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/racing/collision.c | |
| parent | 7adfdaa9abb18d76ae80f26bff58c2c4dc4f3f29 (diff) | |
| parent | 8fb42e50d70356300050048b57def3123e6d4552 (diff) | |
Merge branch 'main' into Caladius-patch-1Caladius-patch-1
Diffstat (limited to 'src/racing/collision.c')
| -rw-r--r-- | src/racing/collision.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/racing/collision.c b/src/racing/collision.c index 225dee00e..e8e9b491b 100644 --- a/src/racing/collision.c +++ b/src/racing/collision.c @@ -17,8 +17,6 @@ #include <stdio.h> #include "engine/RaceManager.h" -#pragma intrinsic(sqrtf) - // Used to delete the choco mountain guard rail void nullify_displaylist(uintptr_t addr) { Gfx* macro; @@ -2068,7 +2066,7 @@ void generate_collision_mesh(Gfx* addr, s8 surfaceType, u16 sectionId) { size_t vtxDataOff = gfx->words.w1 & 0xFFFF; Vtx* vtx = ( (Vtx*)ResourceGetDataByName(filePath) ) + vtxDataOff; - set_vtx_buffer(vtx, count, index); + set_vtx_buffer((uintptr_t) vtx, count, index); break; } case G_VTX_OTR_HASH: @@ -2187,7 +2185,7 @@ void find_vtx_and_set_colours(Gfx* displayList, s8 alpha, u8 red, u8 green, u8 b lo = gfx->words.w0; hi = gfx->words.w1; opcode = GFX_GET_OPCODE(lo); - if (opcode == ((u32) (G_ENDDL & 0xFF) << 24)) { + if (opcode == (G_ENDDL << 24)) { break; } else if (opcode == (G_DL << 24)) { find_vtx_and_set_colours((Gfx*) hi, alpha, red, green, blue); |