mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-30 01:49:04 -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_lv4chandelier.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_lv4chandelier.h"
#include "d/d_com_inf_game.h"
@@ -214,7 +214,7 @@ void daObjLv4Chan_c::rideActor(fopAc_ac_c* param_1) {
/* 80C63CFC-80C63F34 000A3C 0238+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Chan_cFv */
int daObjLv4Chan_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]);
JUT_ASSERT(478, model_data != 0);
JUT_ASSERT(478, model_data != NULL);
mModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
if (mModel == NULL) {
return 0;
@@ -236,7 +236,7 @@ int daObjLv4Chan_c::CreateHeap() {
}
mChainModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]);
JUT_ASSERT(500, mChainModelData != 0);
JUT_ASSERT(500, mChainModelData != NULL);
mMdls[0] = new dMdl_obj_c[mMdlLengths[0]];
if (mMdls[0] == NULL) {
@@ -844,7 +844,7 @@ int daObjLv4Chan_c::Draw() {
}
}
dComIfGd_setList();
if (field_0x247c != -1e9f) {
if (field_0x247c != -G_CM3D_F_INF) {
f32 fVar4 = 0.4f + ((field_0x23bc.y - field_0x247c) * -0.2f) / 500.0f;
if (fVar4 > 0.4f) {
fVar4 = 0.4f;