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_msima.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_msima.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_msima.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index f3d62b0c53..556c2d9330 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msima.h" #include "Z2AudioLib/Z2Instances.h" @@ -400,7 +400,7 @@ static int daObj_Msima_Delete(obj_msima_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { obj_msima_class* i_this = (obj_msima_class*)a_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("MAGNESIMA", obj_msima_class::BMDR_S_MAGNE_SIMA); - JUT_ASSERT(847, modelData != 0); + JUT_ASSERT(847, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (i_this->mpModel == NULL) { return 0; @@ -441,7 +441,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { for (int i = 0; i < 4; i++) { for (int j = 0; j < 35; j++) { modelData = (J3DModelData*)dComIfG_getObjectRes("MAGNESIMA", obj_msima_class::BMDR_KUSARI); - JUT_ASSERT(898, modelData != 0); + JUT_ASSERT(898, modelData != NULL); i_this->mChains[i].model[j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mChains[i].model[j] == NULL) { |