mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-22 15:02:54 -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 @@
|
||||
* Snowpeak Ruins Chandelier (Swinging Platform)
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_lv5ychndlr.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
@@ -97,7 +97,7 @@ void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) {
|
||||
/* 80C6DA5C-80C6DB5C 00037C 0100+00 1/0 0/0 0/0 .text CreateHeap__14daObjYchndlr_cFv */
|
||||
int daObjYchndlr_c::CreateHeap() {
|
||||
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]);
|
||||
JUT_ASSERT(0, model_data != 0);
|
||||
JUT_ASSERT(0, model_data != NULL);
|
||||
|
||||
mpChandlierModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
|
||||
if (mpChandlierModel == NULL) {
|
||||
@@ -105,7 +105,7 @@ int daObjYchndlr_c::CreateHeap() {
|
||||
}
|
||||
|
||||
model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]);
|
||||
JUT_ASSERT(0, model_data != 0);
|
||||
JUT_ASSERT(0, model_data != NULL);
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
mpShaftModels[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
|
||||
|
||||
Reference in New Issue
Block a user