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_ppolamp.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_ppolamp.cpp')
| -rw-r--r-- | src/d/actor/d_a_ppolamp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index ea14258e8f..03c2b73146 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ppolamp.h" #include "Z2AudioLib/Z2Instances.h" @@ -113,21 +113,21 @@ void daPPolamp_c::setPclModelMtx() { /* 80D4CE9C-80D4CFB0 0005DC 0114+00 1/1 0/0 0/0 .text createHeap__11daPPolamp_cFv */ int daPPolamp_c::createHeap() { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(347, a_model_data_p != 0); + JUT_ASSERT(347, a_model_data_p != NULL); mModel1 = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mModel1 == NULL) { return 0; } a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(360, a_model_data_p != 0); + JUT_ASSERT(360, a_model_data_p != NULL); mModel2 = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mModel2 == NULL) { return 0; } J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(372, a_bck_p != 0); + JUT_ASSERT(372, a_bck_p != NULL); if (mBck.init(a_bck_p, 1, 2, 1.0f, 0, -1, false) == 0) { return 0; } |