mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-07 11:27:26 -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 @@
|
||||
* Object - Pumpkin Leaf
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_pleaf.h"
|
||||
#include "dol2asm.h"
|
||||
@@ -41,7 +41,7 @@ int daObj_Pleaf_c::create() {
|
||||
new_pos.y += 50.0f;
|
||||
mGndChk.SetPos(&new_pos);
|
||||
mGroundDist = dComIfG_Bgsp().GroundCross(&mGndChk);
|
||||
if (mGroundDist != -1000000000.0f) {
|
||||
if (mGroundDist != -G_CM3D_F_INF) {
|
||||
setEnvTevColor();
|
||||
setRoomNo();
|
||||
}
|
||||
@@ -75,7 +75,7 @@ int daObj_Pleaf_c::Execute() {
|
||||
new_pos.y += 50.0f;
|
||||
mGndChk.SetPos(&new_pos);
|
||||
mGroundDist = dComIfG_Bgsp().GroundCross(&mGndChk);
|
||||
if (mGroundDist != -1000000000.0f) {
|
||||
if (mGroundDist != -G_CM3D_F_INF) {
|
||||
setEnvTevColor();
|
||||
setRoomNo();
|
||||
}
|
||||
@@ -91,7 +91,7 @@ int daObj_Pleaf_c::Draw() {
|
||||
g_env_light.settingTevStruct(0, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
mDoExt_modelUpdateDL(mpModel);
|
||||
if (mGroundDist != -1000000000.0f) {
|
||||
if (mGroundDist != -G_CM3D_F_INF) {
|
||||
mShadowKey =
|
||||
dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos,
|
||||
daObj_Pleaf_Param_c::m.field_0xc, 20.0f, current.pos.y, mGroundDist,
|
||||
|
||||
Reference in New Issue
Block a user