mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-02 18:46:00 -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_tatigi.h"
|
||||
#include "d/d_cc_d.h"
|
||||
@@ -95,7 +95,7 @@ static int daObj_Tatigi_Delete(obj_tatigi_class* i_this) {
|
||||
static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
obj_tatigi_class* i_this = (obj_tatigi_class*)a_this;
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_tg", 3);
|
||||
JUT_ASSERT(279, modelData != 0);
|
||||
JUT_ASSERT(279, modelData != NULL);
|
||||
for (int i = 0; i < i_this->mTgNum; i++) {
|
||||
i_this->mTgs[i].mModel = mDoExt_J3DModel__create(modelData, 0x20000, 0x11000084);
|
||||
if (i_this->mTgs[i].mModel == NULL) {
|
||||
@@ -205,7 +205,7 @@ static int daObj_Tatigi_Create(fopAc_ac_c* a_this) {
|
||||
}
|
||||
daObj_Tatigi_Execute(i_this);
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_tg", 3);
|
||||
JUT_ASSERT(476, modelData != 0);
|
||||
JUT_ASSERT(476, modelData != NULL);
|
||||
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 0) == -1) {
|
||||
// Standing tree: simple model registration failed.
|
||||
OS_REPORT("\x1B" "[43;30m立ち木:シンプルモデル登録失敗しました。\n" "\x1B" "[m");
|
||||
|
||||
Reference in New Issue
Block a user