mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-31 00:45:24 -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_cblock.cpp
+5 -5
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_cblock.h"
#include "d/d_cc_d.h"
@@ -71,7 +71,7 @@ int daObjCBlk_c::Create() {
pnt_index = 0;
}
dPnt* pnt = dPath_GetPnt(roomPath, pnt_index);
JUT_ASSERT(284, pnt != 0)
JUT_ASSERT(284, pnt != NULL)
current.pos = pnt->m_position;
}
initBaseMtx();
@@ -102,7 +102,7 @@ int daObjCBlk_c::Create() {
/* 80BC5CF8-80BC5E58 0003D8 0160+00 1/0 0/0 0/0 .text CreateHeap__11daObjCBlk_cFv */
int daObjCBlk_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
JUT_ASSERT(350, modelData != 0);
JUT_ASSERT(350, modelData != NULL);
model1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (model1 == NULL) {
return 0;
@@ -112,7 +112,7 @@ int daObjCBlk_c::CreateHeap() {
return 0;
}
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(369, modelData != 0);
JUT_ASSERT(369, modelData != NULL);
chain_s* pChain = chains;
for (int i = 0; i < 6; i++) {
pChain->model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -122,7 +122,7 @@ int daObjCBlk_c::CreateHeap() {
pChain++;
}
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6);
JUT_ASSERT(386, modelData != 0);
JUT_ASSERT(386, modelData != NULL);
model2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (model2 == NULL) {
return 0;