mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-12 13:04:38 -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_ppolamp.h"
|
||||
#include "Z2AudioLib/Z2Instances.h"
|
||||
@@ -113,21 +113,21 @@ void daPPolamp_c::setPclModelMtx() {
|
||||
/* 80D4CE9C-80D4CFB0 0005DC 0114+00 1/1 0/0 0/0 .text createHeap__11daPPolamp_cFv */
|
||||
int daPPolamp_c::createHeap() {
|
||||
J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
|
||||
JUT_ASSERT(347, a_model_data_p != 0);
|
||||
JUT_ASSERT(347, a_model_data_p != NULL);
|
||||
mModel1 = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084);
|
||||
if (mModel1 == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
|
||||
JUT_ASSERT(360, a_model_data_p != 0);
|
||||
JUT_ASSERT(360, a_model_data_p != NULL);
|
||||
mModel2 = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084);
|
||||
if (mModel2 == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
|
||||
JUT_ASSERT(372, a_bck_p != 0);
|
||||
JUT_ASSERT(372, a_bck_p != NULL);
|
||||
if (mBck.init(a_bck_p, 1, 2, 1.0f, 0, -1, false) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user