mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-24 07:41: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 @@
|
||||
* Treasure Chest (Opened state not saved)
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_tbox2.h"
|
||||
#include "d/d_bg_w.h"
|
||||
@@ -112,7 +112,7 @@ int daTbox2_c::Create() {
|
||||
int daTbox2_c::CreateHeap() {
|
||||
J3DModelData* modelData =
|
||||
(J3DModelData*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bmd_no);
|
||||
JUT_ASSERT(0, modelData != 0);
|
||||
JUT_ASSERT(0, modelData != NULL);
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
|
||||
if (mpModel == NULL) {
|
||||
return false;
|
||||
@@ -120,7 +120,7 @@ int daTbox2_c::CreateHeap() {
|
||||
|
||||
J3DAnmTransform* pbck =
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no);
|
||||
JUT_ASSERT(0, pbck != 0);
|
||||
JUT_ASSERT(0, pbck != NULL);
|
||||
mpBck = new mDoExt_bckAnm();
|
||||
if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user