mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-26 00:14:33 -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_npc_ks.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_ks.h"
#include "d/actor/d_a_obj_kago.h"
@@ -6891,7 +6891,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, npc_ks_class::BMDR_SARU_STICK);
JUT_ASSERT(10232, modelData != 0);
JUT_ASSERT(10232, modelData != NULL);
i_this->mpStickModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpStickModel == NULL) {
return 0;
@@ -6899,7 +6899,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
if (i_this->mRoomMonkeyID == 0 || i_this->mRoomMonkeyID == 10 || i_this->mRoomMonkeyID == 20 || i_this->mRoomMonkeyID == 21 || i_this->mRoomMonkeyID == 22) {
modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, npc_ks_class::BMDR_SARU_BARA);
JUT_ASSERT(10249, modelData != 0);
JUT_ASSERT(10249, modelData != NULL);
i_this->mpRoseModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpRoseModel == NULL) {
return 0;