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_e_ga.h"
#include "d/d_com_inf_game.h"
@@ -185,7 +185,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
e_ga_class* a_this = (e_ga_class*)i_this;
void* modelData = dComIfG_getObjectRes("E_Ga", 3);
JUT_ASSERT(450, modelData != 0);
JUT_ASSERT(450, modelData != NULL);
for (int i = 0; i < a_this->ga_num; i++) {
a_this->ga_s[i].model = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084);
@@ -255,7 +255,7 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) {
daE_Ga_Execute(a_this);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ga", 3);
JUT_ASSERT(536, modelData != 0);
JUT_ASSERT(536, modelData != NULL);
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(i_this), FALSE) == -1) {
// "Moth: Simple Model addition failed.\n"