mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-20 06:41:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JUT_ASSERT and several other macros (#2711)

Browse Source 
* 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:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_tobyhouse.cpp
+7 -7
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_tobyhouse.h"
#include "d/actor/d_a_obj_carry.h"
@@ -187,12 +187,12 @@ int daObjTobyHouse_c::Create() {
}
}
J3DJoint* jnt = mModel->getModelData()->getJointNodePointer(mBirlPJnt);
JUT_ASSERT(398, jnt != 0);
JUT_ASSERT(398, jnt != NULL);
jnt->setCallBack(nodeCallBack);
mModel->setUserArea((uintptr_t)this);
jnt = mModel->getModelData()->getJointNodePointer(mBirlCannonJnt);
JUT_ASSERT(406, jnt != 0);
JUT_ASSERT(406, jnt != NULL);
}
initBaseMtx();
return 1;
@@ -201,7 +201,7 @@ int daObjTobyHouse_c::Create() {
/* 80D161A4-80D163A8 0007E4 0204+00 1/0 0/0 0/0 .text CreateHeap__16daObjTobyHouse_cFv */
int daObjTobyHouse_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
JUT_ASSERT(430, modelData != 0);
JUT_ASSERT(430, modelData != NULL);
mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mModel == NULL) {
return 0;
@@ -210,7 +210,7 @@ int daObjTobyHouse_c::CreateHeap() {
for (int i = 0; i < 3; i++) {
J3DAnmTransform* pbck =
(J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[mType], l_bck[i]);
JUT_ASSERT(447, pbck != 0);
JUT_ASSERT(447, pbck != NULL);
mBcks[i] = new mDoExt_bckAnm();
if (mBcks[i] == NULL || !mBcks[i]->init(pbck, 1, 0, 1.0, 0, -1, false)) {
return 0;
@@ -219,9 +219,9 @@ int daObjTobyHouse_c::CreateHeap() {
}
}
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_LodBmd[mType]);
JUT_ASSERT(462, modelData != 0);
JUT_ASSERT(462, modelData != NULL);
J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
JUT_ASSERT(469, shareModelData != 0);
JUT_ASSERT(469, shareModelData != NULL);
mDoExt_setupShareTexture(modelData, shareModelData);
mLODModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mLODModel == NULL) {