mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-18 06:15:20 -04:00
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:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_crvfence.h"
|
||||
#include "d/d_s_play.h"
|
||||
@@ -316,7 +316,7 @@ static int daObjCRVFENCE_Execute(daObjCRVFENCE_c* i_this) {
|
||||
int daObjCRVFENCE_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "CaravanFence.bmd");
|
||||
|
||||
JUT_ASSERT(88, modelData != 0);
|
||||
JUT_ASSERT(88, modelData != NULL);
|
||||
|
||||
field_0x65c = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (field_0x65c == NULL) {
|
||||
@@ -325,7 +325,7 @@ int daObjCRVFENCE_c::CreateHeap() {
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CaravanGate_PieceB.bmd");
|
||||
|
||||
JUT_ASSERT(99, modelData != 0);
|
||||
JUT_ASSERT(99, modelData != NULL);
|
||||
|
||||
field_0x660 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (field_0x660 == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user