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_digsnow.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_digsnow.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_digsnow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 537d27f231..bdcbb70fbe 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -3,7 +3,7 @@ // Object - Dig Snow // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" @@ -43,7 +43,7 @@ static char* l_arcName = "Y_horiyuk"; /* 80BDCD64-80BDCDD4 000184 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjDigSnow_cFv */ int daObjDigSnow_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x9F, modelData != 0); + JUT_ASSERT(0x9F, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -121,7 +121,7 @@ void daObjDigSnow_c::mode_init_dig() { obj_gnd_chk.SetPos(¤t.pos); f32 gnd_height = dComIfG_Bgsp().GroundCross(&obj_gnd_chk); - if (gnd_height != -1000000000.0f) { + if (gnd_height != -G_CM3D_F_INF) { mGroundHeight = gnd_height; } else { #ifdef DEBUG |