mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-14 05:34:38 -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_kolin.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_kolin.h"
#include "Z2AudioLib/Z2Instances.h"
@@ -463,7 +463,7 @@ cPhs__Step daNpc_Kolin_c::create() {
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH();
if (mGroundH != -1000000000.0f) {
if (mGroundH != -G_CM3D_F_INF) {
setEnvTevColor();
setRoomNo();
}
@@ -1383,7 +1383,7 @@ int daNpc_Kolin_c::cutHail(int i_cutIndex) {
mGndChk.SetPos(&work);
work.y = dComIfG_Bgsp().GroundCross(&mGndChk);
JUT_ASSERT(2646, -(1000000000.0f) != work.y);
JUT_ASSERT(2646, -G_CM3D_F_INF != work.y);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, angle, 0);
break;
@@ -2057,7 +2057,7 @@ int daNpc_Kolin_c::timidWalk(void* param_1) {
}
// fallthrough
case 2:;
JUT_ASSERT(4359, 0 != mPath.getPathInfo());
JUT_ASSERT(4359, NULL != mPath.getPathInfo());
/* dSv_event_flag_c::F_0010 - Ordon Village - First convo with Colin blocking path (forced) */
if (!daNpcT_chkEvtBit(14)) {