mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-09 03:59:34 -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_tkj.cpp
+4 -4
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_tkj.h"
@@ -204,7 +204,7 @@ int daNpcTkj_c::CreateHeap() {
int bmd_index = l_bmdData[temp_r23][0];
J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(arcname, bmd_index);
JUT_ASSERT(446, 0 != mdlData_p);
JUT_ASSERT(446, NULL != mdlData_p);
u32 diff_flags = J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 2, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE);
mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, diff_flags);
@@ -584,7 +584,7 @@ int daNpcTkj_c::cutLv7Start(int i_staffId) {
fopAcM_delete(this);
break;
default:
JUT_ASSERT(1188, 0);
JUT_ASSERT(1188, FALSE);
break;
}
}
@@ -628,7 +628,7 @@ int daNpcTkj_c::cutLv7Start(int i_staffId) {
rt = 1;
break;
default:
JUT_ASSERT(1225, 0);
JUT_ASSERT(1225, FALSE);
break;
}