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_kbox.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/d_s_play.h"
#include "d/actor/d_a_obj_kbox.h"
@@ -63,7 +63,7 @@ static void break_eff(obj_kbox_class* i_this) {
cXyz emitterPos(i_this->mActor.current.pos);
cXyz particleScale(1.0f, 1.0f, 1.0f);
J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(146, kibako_bmd != 0);
JUT_ASSERT(146, kibako_bmd != NULL);
JPABaseEmitter* pEmitter = dComIfGp_particle_set(0x82af, &emitterPos, NULL, NULL, 0xff, &dPa_modelEcallBack::getEcallback(),
fopAcM_GetRoomNo(&i_this->mActor), NULL, NULL, &particleScale);
dPa_modelEcallBack::setModel(pEmitter, kibako_bmd, i_this->mActor.tevStr, 3, NULL, 0, 0);
@@ -462,7 +462,7 @@ static int daObj_Kbox_Delete(obj_kbox_class* i_this) {
static int useHeapInit(fopAc_ac_c* a_this) {
obj_kbox_class* i_this = (obj_kbox_class*)a_this;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_kbox", 4);
JUT_ASSERT(911, modelData != 0);
JUT_ASSERT(911, modelData != NULL);
i_this->mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mModel == NULL) {
return 0;