mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-06 02:58:18 -04:00
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:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_kbacket.h"
|
||||
#include "SSystem/SComponent/c_counter.h"
|
||||
@@ -103,7 +103,7 @@ int daObj_KBacket_c::create() {
|
||||
mObjAcch.CrrPos(dComIfG_Bgsp());
|
||||
mGndChk = mObjAcch.m_gnd;
|
||||
field_0xa00 = mObjAcch.GetGroundH();
|
||||
if (field_0xa00 != -1e+09f) {
|
||||
if (field_0xa00 != -G_CM3D_F_INF) {
|
||||
setEnvTevColor();
|
||||
setRoomNo();
|
||||
}
|
||||
@@ -230,7 +230,7 @@ int daObj_KBacket_c::Execute() {
|
||||
s16 unkShort1 = 0x80;
|
||||
|
||||
fopAcM_getWaterY(¤t.pos, &field_0xa04);
|
||||
if (field_0xa04 != -1e+09f &&
|
||||
if (field_0xa04 != -G_CM3D_F_INF &&
|
||||
movePMag < field_0xa04 - field_0xa00 &&
|
||||
current.pos.y <= field_0xa04)
|
||||
{
|
||||
@@ -470,7 +470,7 @@ int daObj_KBacket_c::Execute() {
|
||||
mGndChk = mObjAcch.m_gnd;
|
||||
field_0xa00 = mObjAcch.GetGroundH();
|
||||
|
||||
if (field_0xa00 != -1e+09f) {
|
||||
if (field_0xa00 != -G_CM3D_F_INF) {
|
||||
field_0xa16 = daNpcF_getGroundAngle(&mGndChk, shape_angle.y);
|
||||
|
||||
setEnvTevColor();
|
||||
|
||||
Reference in New Issue
Block a user