mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-19 14:30:29 -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 @@
|
||||
* Morpheel Arena Water
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_lv3WaterB.h"
|
||||
#include "JSystem/J3DGraphBase/J3DMaterial.h"
|
||||
@@ -117,7 +117,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
obj_lv3WaterB_class* a_this = static_cast<obj_lv3WaterB_class*>(i_this);
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L3_bwater", 5);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
a_this->mpBWaterModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
|
||||
if (a_this->mpBWaterModel == NULL) {
|
||||
@@ -147,7 +147,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("S_octhibi", 4);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
a_this->mpOctHibiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (a_this->mpOctHibiModel == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user