diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-28 16:11:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-28 13:11:07 -0700 |
| commit | 9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch) | |
| tree | dde3385855941d12a306de3ca8fb316338be288b /src/d/actor/d_a_npc_toby.cpp | |
| parent | c9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (diff) | |
Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define
* Switch names that appear in asserts to be constants instead of defines
* Replace `0` in asserts with `NULL` or `FALSE`
* Fix fpclassify
* Fix ARRAY_SIZE
* Use G_CM3D_F_INF
* More fixes for fpclassify
* Remove FLOAT_LABEL
* Remove incorrect FLAG_ON macro
* Remove UNK_BSS macro
* Silence clangd unused header warning for PCH
Diffstat (limited to 'src/d/actor/d_a_npc_toby.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_toby.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 6f07a962fc..cbb550e013 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_toby.h" #include "dol2asm.h" @@ -1053,7 +1053,7 @@ COMPILER_STRIP_GATE(0x80B24AAC, &lit_4159); /* 80B24AB0-80B24AB4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4160 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4160 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B24AB0, &lit_4160); #pragma pop @@ -1197,7 +1197,7 @@ void daNpc_Toby_c::srchToby(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80B24AC8-80B24ACC 0000E4 0004+00 1/1 0/0 0/0 .rodata @4593 */ -SECTION_RODATA static f32 const lit_4593 = 1000000000.0f; +SECTION_RODATA static f32 const lit_4593 = G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B24AC8, &lit_4593); /* 80B1F124-80B1F200 000BC4 00DC+00 1/1 0/0 0/0 .text getOtherTobyP__12daNpc_Toby_cFi */ |