mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-05 18:57:14 -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_carry.cpp
+11 -11
View File
@@ -3,7 +3,7 @@
* @brief Actor - Various carriable objects
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_carry.h"
#include "d/actor/d_a_player.h"
@@ -1330,7 +1330,7 @@ int daObjCarry_c::CreateInit_Lv8Ball() {
/* 80470B5C-80470BF4 001BDC 0098+00 1/1 0/0 0/0 .text CreateHeap__12daObjCarry_cFv */
int daObjCarry_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getArcName(), getBmdName());
JUT_ASSERT(2813, modelData != 0);
JUT_ASSERT(2813, modelData != NULL);
u32 mdl_flags = prm_chk_type_ironball() ? J3DMdlFlag_None : J3DMdlFlag_DifferedDLBuffer;
mpModel = mDoExt_J3DModel__create(modelData, mdl_flags, 0x11000084);
@@ -2167,7 +2167,7 @@ int daObjCarry_c::_delete() {
}
if (prm_chk_type_ironball()) {
if (-1000000000.0f != mAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
savePos(getSaveID(), current.pos);
setRoomNo(getSaveID(), fopAcM_GetRoomNo(this));
} else {
@@ -2305,7 +2305,7 @@ BOOL daObjCarry_c::checkRollAngle() {
bool valid_plane = fopAcM_gc_c::getTriPla(&plane);
f32 ground_y = fopAcM_gc_c::getGroundY();
if (gnd_chk && ground_y != -1000000000.0f && valid_plane) {
if (gnd_chk && ground_y != -G_CM3D_F_INF && valid_plane) {
f32 roll_threshold = cM_scos(cM_deg2s(roll_angle - 0.5f));
cXyz normal(plane.mNormal);
if (normal.y < roll_threshold) {
@@ -2522,7 +2522,7 @@ int daObjCarry_c::mode_proc_walk() {
f32 var_f31 = data().m_slopeInfluence;
f32 temp_f25 = fopAcM_gc_c::getGroundY();
if (gnd_check && -1000000000.0f != temp_f25 && gnd_hit && !gnd_landing) {
if (gnd_check && -G_CM3D_F_INF != temp_f25 && gnd_hit && !gnd_landing) {
bool var_r27 = 1;
if (fopAcM_gc_c::getPolyAtt0() == 3) {
var_r27 = 0;
@@ -3848,8 +3848,8 @@ void daObjCarry_c::eff_break_tuboBmd(u16 param_0, cXyz param_1) {
J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20);
J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42);
JUT_ASSERT(6963, tubo_bmd != 0);
JUT_ASSERT(6964, tubo_btp != 0);
JUT_ASSERT(6963, tubo_bmd != NULL);
JUT_ASSERT(6964, tubo_btp != NULL);
JPABaseEmitter* emitter = dComIfGp_particle_set(0x15C, &current.pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, &param_1);
@@ -3863,7 +3863,7 @@ void daObjCarry_c::eff_break_kibakoBmd(cXyz i_size) {
cXyz pos(current.pos);
J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(7005, kibako_bmd != 0);
JUT_ASSERT(7005, kibako_bmd != NULL);
JPABaseEmitter* emitter = dComIfGp_particle_set(0x82AF, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, &i_size);
@@ -3927,8 +3927,8 @@ void daObjCarry_c::eff_break_bokkuri() {
J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20);
J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42);
JUT_ASSERT(7108, tubo_bmd != 0);
JUT_ASSERT(7109, tubo_btp != 0);
JUT_ASSERT(7108, tubo_bmd != NULL);
JUT_ASSERT(7109, tubo_btp != NULL);
JPABaseEmitter* emitter = dComIfGp_particle_set(0x15C, &current.pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, &scale);
@@ -4248,7 +4248,7 @@ void daObjCarry_c::exec_proc_kibako() {}
/* 8047884C-804788C4 0098CC 0078+00 1/0 0/0 0/0 .text exec_proc_ironball__12daObjCarry_cFv */
void daObjCarry_c::exec_proc_ironball() {
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
savePos(getSaveID(), current.pos);
setRoomNo(getSaveID(), fopAcM_GetRoomNo(this));
}