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_hhashi.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_hhashi.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_hhashi.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 053723dff0..32f8234f1a 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hhashi.h" #include "d/actor/d_a_e_fm.h" @@ -299,9 +299,9 @@ static char* l_arcName = "L_hhashi"; /* 80580DA4-80580EA0 001464 00FC+00 1/0 0/0 0/0 .text CreateHeap__13daObjHHASHI_cFv */ int daObjHHASHI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi00.bmd"); - JUT_ASSERT(90, modelData != 0); + JUT_ASSERT(90, modelData != NULL); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); - JUT_ASSERT(93, modelData2 != 0); + JUT_ASSERT(93, modelData2 != NULL); for (int i = 0; i < 50; i++) { mShardModels[i] = mDoExt_J3DModel__create(modelData2, 0x20000, 0x11000084); if (mShardModels[i] == NULL) { @@ -327,7 +327,7 @@ int daObjHHASHI_c::create() { initCcCylinder(); fopAcM_SetMtx(this, mModel->getBaseTRMtx()); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); - JUT_ASSERT(1133, modelData != 0); + JUT_ASSERT(1133, modelData != NULL); dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0); field_0x1199 = 1; daObjHHASHI_Execute(this); |