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
This commit is contained in:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
+3 -3
View File
@@ -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) {