mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-28 09:13:10 -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_rstair.cpp
+4 -4
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_rstair.h"
#include "d/d_bg_w.h"
@@ -87,20 +87,20 @@ static Vec l_water_check_offset = {
/* 80CC17F0-80CC19E0 000310 01F0+00 1/0 0/0 0/0 .text CreateHeap__15daObjRotStair_cFv */
int daObjRotStair_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(215, modelData != 0);
JUT_ASSERT(215, modelData != NULL);
mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mModel == NULL) {
return 0;
}
for (int i = 0; i < 2; i++) {
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_wtr_bmd[i]);
JUT_ASSERT(232, modelData != 0);
JUT_ASSERT(232, modelData != NULL);
mWaterModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x19000284);
if (mWaterModels[i] == NULL) {
return 0;
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_wtr_btk[i]);
JUT_ASSERT(245, pbtk != 0);
JUT_ASSERT(245, pbtk != NULL);
mBtks[i] = new mDoExt_btkAnm();
if (mBtks[i] == NULL || mBtks[i]->init(modelData, pbtk, 1, 2, 1.0f, 0, -1) == 0) {
return 0;