mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-13 13:16:23 -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_automata.h"
|
||||
#include "SSystem/SComponent/c_counter.h"
|
||||
@@ -88,7 +88,7 @@ int daObj_AutoMata_c::create() {
|
||||
mAcch.CrrPos(dComIfG_Bgsp());
|
||||
mGndChk = mAcch.m_gnd;
|
||||
mGroundH = mAcch.GetGroundH();
|
||||
if (mGroundH != -1e9f) {
|
||||
if (mGroundH != -G_CM3D_F_INF) {
|
||||
setEnvTevColor();
|
||||
setRoomNo();
|
||||
}
|
||||
@@ -134,7 +134,7 @@ int daObj_AutoMata_c::Execute() {
|
||||
mAcch.CrrPos(dComIfG_Bgsp());
|
||||
mGndChk = mAcch.m_gnd;
|
||||
mGroundH = mAcch.GetGroundH();
|
||||
if (mGroundH != -1e9f) {
|
||||
if (mGroundH != -G_CM3D_F_INF) {
|
||||
if (fopAcIt_Judge((fopAcIt_JudgeFunc)srchTHouse, ¤t.pos) != NULL) {
|
||||
current.pos.y = mGroundH;
|
||||
}
|
||||
@@ -179,7 +179,7 @@ int daObj_AutoMata_c::Draw() {
|
||||
mBtk.entry(modelData);
|
||||
mpMorf->entryDL();
|
||||
mBtk.remove(modelData);
|
||||
if (mGroundH != -1e+09f) {
|
||||
if (mGroundH != -G_CM3D_F_INF) {
|
||||
mShadowId = dComIfGd_setShadow(
|
||||
mShadowId, 1, morfModel, ¤t.pos, 600.0f, 20.0f,
|
||||
current.pos.y, mGroundH, mGndChk,
|
||||
|
||||
Reference in New Issue
Block a user