mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_e_yr.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_e_yr.h"
#include "d/actor/d_a_horse.h"
@@ -585,7 +585,7 @@ static void e_yr_path_move(e_yr_class* i_this) {
s32 nextId = i_this->field_0x6ec->m_nextID;
if (nextId != 0xffff) {
i_this->field_0x6ec = dPath_GetRoomPath(nextId, fopAcM_GetRoomNo(actor));
JUT_ASSERT(0x451, i_this->field_0x6ec != 0);
JUT_ASSERT(0x451, i_this->field_0x6ec != NULL);
}
} else {
if (i_this->field_0x6ea < 0) {
@@ -1985,14 +1985,14 @@ static void ground_angle_set(e_yr_class* i_this) {
gndChk.SetPos(&unkXyz3);
unkXyz3.y = dComIfG_Bgsp().GroundCross(&gndChk);
if (unkXyz3.y != -1e+09f) {
if (unkXyz3.y != -G_CM3D_F_INF) {
unkVec1.x = unkXyz3.x;
unkVec1.y = unkXyz3.y + 100.0f;
unkVec1.z = unkXyz3.z + unkFloat1;
gndChk.SetPos(&unkVec1);
unkVec1.y = dComIfG_Bgsp().GroundCross(&gndChk);
if (unkVec1.y != -1e+09f) {
if (unkVec1.y != -G_CM3D_F_INF) {
yDiff = unkVec1.y - unkXyz3.y;
zDiff = unkVec1.z - unkXyz3.z;
unkShort2 = -cM_atan2s(yDiff, zDiff);
@@ -2005,7 +2005,7 @@ static void ground_angle_set(e_yr_class* i_this) {
unkVec1.z = unkXyz3.z;
gndChk.SetPos(&unkVec1);
unkVec1.y = dComIfG_Bgsp().GroundCross(&gndChk);
if (unkVec1.y != -1e+09f) {
if (unkVec1.y != -G_CM3D_F_INF) {
yDiff = unkVec1.y - unkXyz3.y;
xDiff = unkVec1.x - unkXyz3.x;
unkShort1 = (s16)cM_atan2s(yDiff, xDiff);