mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -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_nbomb.cpp
+4 -4
View File
@@ -3,7 +3,7 @@
* Bomb Actor
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_nbomb.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -141,7 +141,7 @@ int daNbomb_c::createHeap() {
J3DModelData* modelData =
(J3DModelData*)dComIfG_getObjectRes(m_arcNameList[mType], bmdIdx[mType]);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpModel == NULL) {
return 0;
@@ -479,7 +479,7 @@ BOOL daNbomb_c::checkExplode() {
/* 804C8430-804C84D8 001750 00A8+00 5/5 0/0 0/0 .text setRoomInfo__9daNbomb_cFv */
void daNbomb_c::setRoomInfo() {
int room_no;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
mPolySound = dKy_pol_sound_get(&mAcch.m_gnd);
@@ -1701,7 +1701,7 @@ int daNbomb_c::draw() {
mat->setTevColor(1, &bomb_color);
}
if (mAcch.GetGroundH() != -1000000000.0f && !fopAcM_checkCarryNow(this)) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF && !fopAcM_checkCarryNow(this)) {
cM3dGPla ground_poly;
if (dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &ground_poly)) {
dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), scale.x * 25.0f,