mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-17 14:06:42 -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_oc.cpp
+8 -8
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_oc.h"
#include "d/d_camera.h"
@@ -449,7 +449,7 @@ int daE_OC_c::checkBeforeFloorBg(f32 arg) {
cLib_offsetPos(&my_vec_0, &current.pos, shape_angle.y, &my_vec_1);
gnd_chk_spl.SetPos(&my_vec_0);
f32 val_0 = dComIfG_Bgsp().GroundCross(&gnd_chk_spl);
if (val_0 != -1e+09f) {
if (val_0 != -G_CM3D_F_INF) {
gnd_chk.SetPos(&my_vec_0);
if (val_0 >= dComIfG_Bgsp().GroundCross(&gnd_chk))
return 1;
@@ -499,7 +499,7 @@ void daE_OC_c::setGroundAngle() {
my_vec_0.z = my_vec_2.z + 80.0f;
gnd_chk.SetPos(&my_vec_0);
my_vec_0.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (my_vec_0.y != -1e+09f && (f32)fabs(my_vec_0.y - my_vec_2.y) < 50.0f) {
if (my_vec_0.y != -G_CM3D_F_INF && (f32)fabs(my_vec_0.y - my_vec_2.y) < 50.0f) {
my_vec_3 = my_vec_0 - my_vec_2;
field_0x688.x = -cM_atan2s(my_vec_3.y, my_vec_3.z);
}
@@ -508,7 +508,7 @@ void daE_OC_c::setGroundAngle() {
my_vec_1.z = my_vec_2.z;
gnd_chk.SetPos(&my_vec_1);
my_vec_1.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (my_vec_1.y != -1e+09f && (f32)fabs(my_vec_1.y - my_vec_2.y) < 50.0f) {
if (my_vec_1.y != -G_CM3D_F_INF && (f32)fabs(my_vec_1.y - my_vec_2.y) < 50.0f) {
my_vec_3 = my_vec_1 - my_vec_2;
field_0x688.z = cM_atan2s(my_vec_3.y, my_vec_3.x);
}
@@ -1227,10 +1227,10 @@ void daE_OC_c::setWeaponGroundAngle() {
my_vec_1.y += 100.0f;
gnd_chk.SetPos(&my_vec_0);
my_vec_0.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (my_vec_0.y != -1e+09f) {
if (my_vec_0.y != -G_CM3D_F_INF) {
gnd_chk.SetPos(&my_vec_1);
my_vec_1.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (my_vec_1.y != -1e+09f) {
if (my_vec_1.y != -G_CM3D_F_INF) {
f32 my_float = my_vec_0.absXZ(my_vec_1);
my_val = (s16) -cM_atan2s(my_vec_1.y - my_vec_0.y, my_float);
if (my_val < -0x2000) {
@@ -2009,7 +2009,7 @@ void daE_OC_c::checkFall() {
}
if (mActionMode != 0xD && mActionMode != 0xE && mActionMode != 10 &&
mActionMode != 0xB && mActionMode != 0xC && speed.y < 0.0f) {
if (groundY == -1000000000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4
if (groundY == -G_CM3D_F_INF || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4
|| dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10
|| dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) {
if (field_0x69c > current.pos.y) {
@@ -2251,7 +2251,7 @@ bool daE_OC_c::checkWaterSurface() {
gnd_chk_spl.SetPos((Vec*)&my_vec_0);
mWaterLvl = dComIfG_Bgsp().GroundCross(&gnd_chk_spl);
if (mAcch.ChkGroundHit()) {
mWaterLvl = -1e9f;
mWaterLvl = -G_CM3D_F_INF;
}
if (mWaterLvl > (current.pos.y - 140.0f)) {
return 1;