mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -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_grz.cpp
+6 -6
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_grz.h"
#include "d/actor/d_a_obj_grz_rock.h"
@@ -519,7 +519,7 @@ int daNpc_Grz_c::CreateHeap() {
mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[0][1]], l_bmdGetParamList[0][0]);
}
JUT_ASSERT(556, 0 != mdlData_p);
JUT_ASSERT(556, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) {
@@ -1576,7 +1576,7 @@ BOOL daNpc_Grz_c::doEvent() {
int evtCutNo = eventManager.getMyActIdx(staffId, mEvtCutNameList, 7, 0, 0);
JUT_ASSERT(2262, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e));
JUT_ASSERT(2263, 0 != mEvtCutList[evtCutNo]);
JUT_ASSERT(2263, NULL != mEvtCutList[evtCutNo]);
if ((this->*mEvtCutList[evtCutNo])(staffId)) {
eventManager.cutEnd(staffId);
@@ -2180,7 +2180,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) {
case 0:
actor = (fopAc_ac_c*)fpcM_Search(s_sub2, this);
JUT_ASSERT(3349, 0 != actor);
JUT_ASSERT(3349, NULL != actor);
mActorMngrs[2].entry(actor);
setLookMode(LOOK_ATTN);
@@ -2189,7 +2189,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) {
case 1:
actor = (fopAc_ac_c*)fpcM_Search(s_sub3, this);
JUT_ASSERT(3359, 0 != actor);
JUT_ASSERT(3359, NULL != actor);
mActorMngrs[2].entry(actor);
setLookMode(LOOK_ATTN);
@@ -2226,7 +2226,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) {
case 0: {
fopAc_ac_c* actor_p = mActorMngrs[2].getActorP();
JUT_ASSERT(3415, 0 != actor_p);
JUT_ASSERT(3415, NULL != actor_p);
s16 angleY = fopAcM_searchActorAngleY(this, actor_p);
if (angleY == mCurAngle.y) {