mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-04 02:16:03 -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_bubblePilar.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -45,13 +45,13 @@ void daBubbPilar_c::setBaseMtx() {
|
||||
/* 80BC3518-80BC35D0 000218 00B8+00 1/0 0/0 0/0 .text CreateHeap__13daBubbPilar_cFv */
|
||||
int daBubbPilar_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("M_Crack", 4);
|
||||
JUT_ASSERT(226, modelData != 0);
|
||||
JUT_ASSERT(226, modelData != NULL);
|
||||
mModels[MODE_WAIT] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mModels[MODE_WAIT] == NULL) {
|
||||
return 0;
|
||||
}
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("M_Crack", 5);
|
||||
JUT_ASSERT(237, modelData != 0);
|
||||
JUT_ASSERT(237, modelData != NULL);
|
||||
mModels[MODE_EFF_ON] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mModels[MODE_EFF_ON] == NULL) {
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user