mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-09 20:10:37 -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_swpush5.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -104,7 +104,7 @@ int daObjSw5_c::Create() {
|
||||
mpBgW->SetRideCallback(rideCallBack);
|
||||
|
||||
J3DJoint* sw_jnt = mpModel->getModelData()->getJointNodePointer(1);
|
||||
JUT_ASSERT(276, sw_jnt != 0);
|
||||
JUT_ASSERT(276, sw_jnt != NULL);
|
||||
|
||||
sw_jnt->setCallBack(nodeCallBack);
|
||||
mpModel->setUserArea((uintptr_t)this);
|
||||
@@ -125,7 +125,7 @@ static char* l_arcName = "D_Hfsw00";
|
||||
/* 8059BA1C-8059BB1C 00061C 0100+00 1/0 0/0 0/0 .text CreateHeap__10daObjSw5_cFv */
|
||||
int daObjSw5_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
|
||||
JUT_ASSERT(308, modelData != 0);
|
||||
JUT_ASSERT(308, modelData != NULL);
|
||||
|
||||
mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS);
|
||||
if (mpModel == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user