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_cd.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_cd.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_cd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 76972da115..a1f852c08c 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/npc/d_a_npc_cd // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_cd.h" #include "d/actor/d_a_player.h" @@ -218,7 +218,7 @@ dCcD_SrcCyl const daNpcCd_c::m_cylDat = { int daNpcCd_c::NpcCreate(int param_1) { J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1); - JUT_ASSERT(470, 0 != a_mdlData_p); + JUT_ASSERT(470, NULL != a_mdlData_p); mpMorf = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11000084); |