mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-01 17:27:19 -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_rgate.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
* Bulblin Gate
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_rgate.h"
#include "SSystem/SComponent/c_math.h"
@@ -256,7 +256,7 @@ int daObjRgate_c::Create() {
for (u16 i = 0; i < mpGateModel->getModelData()->getJointNum(); i++) {
if ((int)i == 1 || (int)i == 2) {
J3DJoint* jnt = mpGateModel->getModelData()->getJointNodePointer(i);
JUT_ASSERT(448, jnt != 0);
JUT_ASSERT(448, jnt != NULL);
jnt->setCallBack(nodeCallBack);
mpGateModel->setUserArea((uintptr_t)this);
@@ -270,7 +270,7 @@ int daObjRgate_c::Create() {
/* 80CBA654-80CBA828 000A34 01D4+00 1/0 0/0 0/0 .text CreateHeap__12daObjRgate_cFv */
int daObjRgate_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(472, modelData != 0);
JUT_ASSERT(472, modelData != NULL);
mpGateModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpGateModel == NULL) {
@@ -279,10 +279,10 @@ int daObjRgate_c::CreateHeap() {
if (getSwNo() != 0xFF) {
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
JUT_ASSERT(485, modelData != 0);
JUT_ASSERT(485, modelData != NULL);
J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(495, modelData2 != 0);
JUT_ASSERT(495, modelData2 != NULL);
mDoExt_setupShareTexture(modelData, modelData2);
mpKeyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -291,7 +291,7 @@ int daObjRgate_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6);
JUT_ASSERT(511, modelData != 0);
JUT_ASSERT(511, modelData != NULL);
mDoExt_setupShareTexture(modelData, modelData2);
mpHookModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);