summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_toby.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-09-28 16:11:07 -0400
committerGitHub <noreply@github.com>2025-09-28 13:11:07 -0700
commit9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch)
treedde3385855941d12a306de3ca8fb316338be288b /src/d/actor/d_a_obj_toby.cpp
parentc9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (diff)
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
Diffstat (limited to 'src/d/actor/d_a_obj_toby.cpp')
-rw-r--r--src/d/actor/d_a_obj_toby.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp
index 863ed4bef1..e7d2a98190 100644
--- a/src/d/actor/d_a_obj_toby.cpp
+++ b/src/d/actor/d_a_obj_toby.cpp
@@ -3,7 +3,7 @@
*
*/
-#include "d/dolzel_rel.h"
+#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_toby.h"
#include "d/actor/d_a_e_hz.h"
@@ -452,10 +452,10 @@ static int useHeapInit(fopAc_ac_c* a_this) {
if (i_this->field_0x577 == 0) {
modelData = dComIfG_getObjectRes(i_this->mArcName, 4);
- JUT_ASSERT(868, modelData != 0);
+ JUT_ASSERT(868, modelData != NULL);
modelData2 = dComIfG_getObjectRes(i_this->mArcName, 5);
// !@bug assert on wrong variable. not really meaningful.
- JUT_ASSERT(872, modelData != 0);
+ JUT_ASSERT(872, modelData != NULL);
pYuka = i_this->mYukas;
for (int i = 0; i < i_this->mYukaNum; i++, pYuka++) {
i_this->mYukas[i].mModel1 = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084);
@@ -479,7 +479,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
} else if (i_this->field_0x577 == 1) {
a_this->field_0x567 = 1;
modelData = dComIfG_getObjectRes(i_this->mArcName, 6);
- JUT_ASSERT(907, modelData != 0);
+ JUT_ASSERT(907, modelData != NULL);
for (int i = 0; i < i_this->mYukaNum; i++) {
i_this->mYukas[i].mModel1 = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084);
@@ -701,7 +701,7 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) {
if (i_this->field_0x577 == 0) {
for (u32 i = 0; i < 2; i++) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mArcName, l_bmdidx[i]);
- JUT_ASSERT(1341, modelData != 0);
+ JUT_ASSERT(1341, modelData != NULL);
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 1) == -1) {
// Skipping floor: simple model registration failed
OS_REPORT("\x1B" "[43;30m飛び床:シンプルモデル登録失敗しました。\n" "\x1B" "[m");
@@ -710,7 +710,7 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) {
}
} else if (i_this->field_0x577 == 1) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mArcName, 6);
- JUT_ASSERT(1351, modelData != 0);
+ JUT_ASSERT(1351, modelData != NULL);
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 1) == -1) {
//Skipping leaves: simple model registration failed.
OS_REPORT("\x1B" "[43;30m飛び葉:シンプルモデル登録失敗しました。\n" "\x1B" "[m");