mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-07 19:31:19 -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_npc4.cpp
+5 -5
View File
@@ -431,7 +431,7 @@ void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz
mDoMtx_stack_c::multVec(&local_90, &param_2[i]);
}
JUT_ASSERT(1244, 0 != mAttnPos_p);
JUT_ASSERT(1244, NULL != mAttnPos_p);
local_90 = *mAttnPos_p - i_actor->current.pos;
mDoMtx_stack_c::multVec(&local_90, &param_5);
@@ -553,7 +553,7 @@ BOOL daNpcF_c::execute() {
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH();
if (mGroundH != -1000000000.0f) {
if (mGroundH != -G_CM3D_F_INF) {
field_0x998 = daNpcF_getGroundAngle(&mGndChk, mCurAngle.y);
setEnvTevColor();
setRoomNo();
@@ -1235,7 +1235,7 @@ int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2,
fopAc_ac_c* talkPartner = dComIfGp_event_getTalkPartner();
if (talkPartner == param_2) {
msg_class* msg_p = dMsgObject_c::getActor();
JUT_ASSERT(2780, 0 != msg_p);
JUT_ASSERT(2780, NULL != msg_p);
if (msg_p->mode == 2 || msg_p->mode == 3) {
field_0x9a4 = -1;
@@ -1298,7 +1298,7 @@ void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 pa
dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName());
}
JUT_ASSERT(2887, 0 != i_evtName);
JUT_ASSERT(2887, NULL != i_evtName);
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, 0xFF);
dComIfGp_getEvent().reset(this);
@@ -1536,7 +1536,7 @@ fopAc_ac_c* daNpcF_c::getAttnActorP(BOOL i_playerAttn, fpcLyIt_JudgeFunc i_searc
int sp38 = 0;
int sp34;
f32 minDistance = 1000000000.0f;
f32 minDistance = G_CM3D_F_INF;
f32 var_f30 = i_radius;
if (mAttnChangeTimer != 0) {