mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-05 10:47:27 -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_pillar.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -177,7 +177,7 @@ int daPillar_c::Create() {
|
||||
/* 80CAF7A8-80CAF8A4 000568 00FC+00 1/0 0/0 0/0 .text CreateHeap__10daPillar_cFv */
|
||||
int daPillar_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_bmd[mMdlType]);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpModel == NULL) {
|
||||
return 0;
|
||||
@@ -185,7 +185,7 @@ int daPillar_c::CreateHeap() {
|
||||
|
||||
if (checkShadow() == 0xFF) {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_shadowBmd[mMdlType]);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
mpShadowModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpShadowModel == NULL) {
|
||||
return 0;
|
||||
@@ -448,7 +448,7 @@ int daPillar_c::Execute(Mtx** param_0) {
|
||||
}
|
||||
break;
|
||||
default:
|
||||
JUT_ASSERT(0, 0);
|
||||
JUT_ASSERT(0, FALSE);
|
||||
}
|
||||
|
||||
if (shape_angle.x != 0) {
|
||||
|
||||
Reference in New Issue
Block a user