mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-25 16:04:28 -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 Ice Wall
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_lv5IceWall.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -33,7 +33,7 @@ void daIceWall_c::setBaseMtx() {
|
||||
/* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text CreateHeap__11daIceWall_cFv */
|
||||
int daIceWall_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 4);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpModel[0] = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
|
||||
if (mpModel[0] == NULL) {
|
||||
@@ -41,7 +41,7 @@ int daIceWall_c::CreateHeap() {
|
||||
}
|
||||
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 5);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
|
||||
mpModel[1] = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
|
||||
if (mpModel[1] == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user