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_obj_geyser.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_obj_geyser.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_geyser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 8d531053ba..d7533d65e4 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_geyser.h" #include "d/actor/d_a_player.h" @@ -78,7 +78,7 @@ int daObjGeyser_c::Create() { actionOff2Init(); break; default: - JUT_ASSERT(309, 0); + JUT_ASSERT(309, FALSE); break; } @@ -98,7 +98,7 @@ int daObjGeyser_c::Create() { /* 80BF70E0-80BF7174 000240 0094+00 1/0 0/0 0/0 .text CreateHeap__13daObjGeyser_cFv */ int daObjGeyser_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(345, modelData != 0); + JUT_ASSERT(345, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -215,7 +215,7 @@ void daObjGeyser_c::action() { (this->*l_func2[mAction])(); break; default: - JUT_ASSERT(309, 0); + JUT_ASSERT(309, FALSE); break; } } |