From 9eea9289b1c4316d5856d1cb9602ee463d7de989 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 28 Sep 2025 16:11:07 -0400 Subject: 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 --- src/d/actor/d_a_obj_fallobj.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/d/actor/d_a_obj_fallobj.cpp') diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 3a08f384c4..68dda45de1 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fallobj.h" #include "d/actor/d_a_player.h" @@ -114,7 +114,7 @@ f32 daObjFallObj_c::getFallHeight() { /* 80BE3C28-80BE3C98 0002E8 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjFallObj_cFv */ int daObjFallObj_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(260, modelData != 0); + JUT_ASSERT(260, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mpModel != NULL ? TRUE : FALSE; } -- cgit v1.2.3