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_boumato.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_boumato.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_boumato.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index c122fec7cf..e2e845c7cc 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_boumato.h" #include "SSystem/SComponent/c_counter.h" @@ -98,7 +98,7 @@ int daObj_BouMato_c::create() { /* 80BBB770-80BBB800 000870 0090+00 1/1 0/0 0/0 .text CreateHeap__15daObj_BouMato_cFv */ int daObj_BouMato_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 4); - JUT_ASSERT(374, 0 != mdlData_p); + JUT_ASSERT(374, NULL != mdlData_p); mModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mModel == NULL) { return 0; @@ -161,7 +161,7 @@ int daObj_BouMato_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -206,7 +206,7 @@ int daObj_BouMato_c::Draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); mDoExt_modelUpdateDL(mModel); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { mShadowId = dComIfGd_setShadow(mShadowId, 1, mModel, ¤t.pos, daObj_BouMato_Param_c::m[3], 20.0f, current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, |