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_tombo.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_tombo.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_tombo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index af7e401f0a..7256e31b53 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tombo.h" #include "d/actor/d_a_player.h" @@ -91,7 +91,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { /* 80D192E4-80D195CC 000204 02E8+00 1/1 0/0 0/0 .text CreateHeap__12daObjTOMBO_cFv */ int daObjTOMBO_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Tombo", 9); - JUT_ASSERT(259, modelData != 0); + JUT_ASSERT(259, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Tombo", 6), 2, 1.0, 0, -1, &mCreature, 0, 0x11000284); @@ -189,7 +189,7 @@ bool daObjTOMBO_c::CheckWater() { cXyz gndPos(current.pos.x, current.pos.y + 100.0f, current.pos.z); adStack_6c.SetPos(&gndPos); gndPos.y = dComIfG_Bgsp().GroundCross(&adStack_6c); - if (gndPos.y != -1e9f) { + if (gndPos.y != -G_CM3D_F_INF) { if (dComIfG_Bgsp().GetPolyAtt0(adStack_6c) == 7 && current.pos.y - gndPos.y < 50.0f) { return TRUE; } @@ -203,7 +203,7 @@ void daObjTOMBO_c::CheckGround() { cXyz gndPos(current.pos.x, current.pos.y + 100.0f, current.pos.z); adStack_6c.SetPos(&gndPos); gndPos.y = dComIfG_Bgsp().GroundCross(&adStack_6c); - if (gndPos.y != -1e9f) { + if (gndPos.y != -G_CM3D_F_INF) { if (current.pos.y - gndPos.y < 100.0f) { field_0x720 = 3.0f; } else if (current.pos.y - gndPos.y > 300.0f) { |