mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-02 01:30:00 -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_iceblock.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_iceblock.h"
#include "SSystem/SComponent/c_math.h"
@@ -324,7 +324,7 @@ int daObjIceBlk_c::CreateHeap() {
if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpIceModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
if (mpIceModel == NULL) {
@@ -345,10 +345,10 @@ int daObjIceBlk_c::CreateHeap() {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[1]);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]);
JUT_ASSERT(0, shareModelData != 0);
JUT_ASSERT(0, shareModelData != NULL);
mDoExt_setupShareTexture(modelData, shareModelData);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -672,7 +672,7 @@ int daObjIceBlk_c::checkWallPre(s16 i_angle) {
/* 80C236C8-80C237B0 001A68 00E8+00 2/2 0/0 0/0 .text checkBgHit__13daObjIceBlk_cFv */
int daObjIceBlk_c::checkBgHit() {
cXyz check_pos;
mGroundY = -1000000000.0f;
mGroundY = -G_CM3D_F_INF;
int var_r29 = -1;