mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-03 02:53:08 -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_bou.cpp
+13 -13
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_bou.h"
#include "d/actor/d_a_cow.h"
@@ -215,7 +215,7 @@ int daNpc_Bou_c::create() {
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH();
if (mGroundH != -1000000000.0f) {
if (mGroundH != -G_CM3D_F_INF) {
setEnvTevColor();
setRoomNo();
}
@@ -325,7 +325,7 @@ void* daNpc_Bou_c::srchCow(void* arg0, void* arg1) {
/* 8096D9B4-8096DA78 000B14 00C4+00 1/1 0/0 0/0 .text getCowP__11daNpc_Bou_cFv */
fopAc_ac_c* daNpc_Bou_c::getCowP() {
fopAc_ac_c* pActor = NULL;
f32 minDist = 1e9f;
f32 minDist = G_CM3D_F_INF;
mFindCount = 0;
fopAcM_Search(srchCow, this);
for (int i = 0; i < mFindCount; i++) {
@@ -832,7 +832,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
switch (prm_val) {
case 0: {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x803, 0 != actor_p);
JUT_ASSERT(0x803, NULL != actor_p);
((daCow_c *)actor_p)->setCrazyReady();
daNpcT_offTmpBit(0x1C);
initTalk(mFlowNodeNo, NULL);
@@ -841,7 +841,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
case 2: {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x811, 0 != actor_p);
JUT_ASSERT(0x811, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
Z2GetAudioMgr()->subBgmStart(0x1000011);
break;
@@ -849,7 +849,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
case 5: {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x820, 0 != actor_p);
JUT_ASSERT(0x820, NULL != actor_p);
((daCow_c *)actor_p)->setCrazyGo();
break;
}
@@ -898,7 +898,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
if (prm_val == 2 || prm_val == 3) {
if (prm_val == 3) {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x853, 0 != actor_p);
JUT_ASSERT(0x853, NULL != actor_p);
mJntAnm.lookActor(actor_p, 0.0f, 0);
}
@@ -919,7 +919,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
if (prm_val == 3 && ret_val != 0) {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x86A, 0 != actor_p);
JUT_ASSERT(0x86A, NULL != actor_p);
((daCow_c *)actor_p)->setCrazyReadyDrawOn();
}
@@ -932,7 +932,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
case 7:
case 8: {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x875, 0 != actor_p);
JUT_ASSERT(0x875, NULL != actor_p);
mJntAnm.lookActor(actor_p, 0.0f, 0);
ret_val = 1;
}
@@ -1351,7 +1351,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) {
work += current.pos;
mGndChk.SetPos(&work);
work.y = dComIfG_Bgsp().GroundCross(&mGndChk);
JUT_ASSERT(0xab4, -(1000000000.0f) != work.y);
JUT_ASSERT(0xab4, -G_CM3D_F_INF != work.y);
dComIfGp_evmng_setGoal(&work);
my_svec.y = mCurAngle.y + 0x5800;
@@ -1361,7 +1361,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) {
temp += work;
mGndChk.SetPos(&temp);
work.y = dComIfG_Bgsp().GroundCross(&mGndChk);
JUT_ASSERT(0xabf, -(1000000000.0f) != work.y);
JUT_ASSERT(0xabf, -G_CM3D_F_INF != work.y);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&temp, my_svec.y, 0);
} else {
my_svec.y = mPlayerAngle - home.angle.y;
@@ -1381,7 +1381,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) {
work += current.pos;
mGndChk.SetPos(&work);
work.y = dComIfG_Bgsp().GroundCross(&mGndChk);
JUT_ASSERT(0xad8, -(1000000000.0f) != work.y);
JUT_ASSERT(0xad8, -G_CM3D_F_INF != work.y);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, mCurAngle.y + 0x8000, 0);
work.set(0.0f, 300.0f, 150.0f);
@@ -1390,7 +1390,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) {
work += current.pos;
mGndChk.SetPos(&work);
work.y = dComIfG_Bgsp().GroundCross(&mGndChk);
JUT_ASSERT(0xae2, -(1000000000.0f) != work.y);
JUT_ASSERT(0xae2, -G_CM3D_F_INF != work.y);
dComIfGp_evmng_setGoal(&work);
}