Fix JUT_ASSERT and several other macros (#2711)

* 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
+3 -3
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_dk.h"
#include "d/actor/d_a_player.h"
@@ -281,7 +281,7 @@ void daE_DK_c::checkWaterHeight() {
gndChkPos.y += 1000.0f;
gndChk.SetPos(&gndChkPos);
field_0x6b8 = dComIfG_Bgsp().GroundCross(&gndChk);
if (field_0x6b8 != -1000000000.0f && current.pos.y + 350.0f > field_0x6b8) {
if (field_0x6b8 != -G_CM3D_F_INF && current.pos.y + 350.0f > field_0x6b8) {
current.pos.y = field_0x6b8 - 350.0f;
}
} else {
@@ -289,7 +289,7 @@ void daE_DK_c::checkWaterHeight() {
gndChkPos.y += 1000.0f;
gndChk.SetPos(&gndChkPos);
field_0x6b8 = dComIfG_Bgsp().GroundCross(&gndChk);
if (field_0x6b8 != -1000000000.0f && field_0x670.y + 350.0f > field_0x6b8) {
if (field_0x6b8 != -G_CM3D_F_INF && field_0x670.y + 350.0f > field_0x6b8) {
field_0x670.y = field_0x6b8 - 350.0f;
}
}