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 @@
* Arbiter's Grounds Dig Sand
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_lv4digsand.h"
#include "d/d_com_inf_game.h"
@@ -43,7 +43,7 @@ static char* l_arcName = "P_DSand";
/* 80C66C24-80C66C94 000184 0070+00 1/0 0/0 0/0 .text CreateHeap__16daObjL4DigSand_cFv */
int daObjL4DigSand_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
JUT_ASSERT(0x9B, modelData != 0);
JUT_ASSERT(0x9B, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
@@ -117,7 +117,7 @@ void daObjL4DigSand_c::mode_init_dig() {
gndchk.SetPos(&current.pos);
f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk);
if (gnd_y != -1000000000.0f) {
if (gnd_y != -G_CM3D_F_INF) {
mGroundY = gnd_y;
} else {
#ifdef DEBUG