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 @@
* Object - Hotspring Water Barrel
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_onsenTaru.h"
#include "d/actor/d_a_player.h"
@@ -51,7 +51,7 @@ void daOnsTaru_c::setBaseMtx() {
/* 80CA8748-80CA87B4 000268 006C+00 1/0 0/0 0/0 .text CreateHeap__11daOnsTaru_cFv */
int daOnsTaru_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("maroTaru", 3);
JUT_ASSERT(231, modelData != 0);
JUT_ASSERT(231, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
@@ -361,7 +361,7 @@ void daOnsTaru_c::breakEffSet() {
cXyz scale(0.75f, 0.75f, 0.75f);
J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(0x310, kibako_bmd != 0);
JUT_ASSERT(784, kibako_bmd != NULL);
JPABaseEmitter* emitter =
dComIfGp_particle_set(0x8A99, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(),