summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_yel_bag.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-09-28 16:11:07 -0400
committerGitHub <noreply@github.com>2025-09-28 13:11:07 -0700
commit9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch)
treedde3385855941d12a306de3ca8fb316338be288b /src/d/actor/d_a_obj_yel_bag.cpp
parentc9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (diff)
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
Diffstat (limited to 'src/d/actor/d_a_obj_yel_bag.cpp')
-rw-r--r--src/d/actor/d_a_obj_yel_bag.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp
index d290006785..14c4cb1c5e 100644
--- a/src/d/actor/d_a_obj_yel_bag.cpp
+++ b/src/d/actor/d_a_obj_yel_bag.cpp
@@ -3,7 +3,7 @@
*
*/
-#include "d/dolzel_rel.h"
+#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_yel_bag.h"
#include "d/actor/d_a_npc.h"
@@ -166,7 +166,7 @@ int daObj_YBag_c::Execute() {
field_0xa33 = 1;
} else {
fopAcM_getWaterY(&current.pos, &field_0x9f4);
- if (field_0x9f4 != -1e9f && daObj_YBag_Param_c::m[10] < field_0x9f4 - field_0x9f0 &&
+ if (field_0x9f4 != -G_CM3D_F_INF && daObj_YBag_Param_c::m[10] < field_0x9f4 - field_0x9f0 &&
current.pos.y <= field_0x9f4 && field_0xa32 == 0)
{
if (field_0xa33 != 0) {
@@ -248,7 +248,7 @@ int daObj_YBag_c::Execute() {
}
if (mAcch.ChkGroundLanding()) {
if (field_0x9c4.y < -30.0f) {
- if (field_0x9f4 != -1e9f && current.pos.y <= field_0x9f4) {
+ if (field_0x9f4 != -G_CM3D_F_INF && current.pos.y <= field_0x9f4) {
setWaterPrtcl();
} else {
setSmokePrtcl();
@@ -318,7 +318,7 @@ int daObj_YBag_c::Execute() {
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
field_0x9f0 = mAcch.GetGroundH();
- if (field_0x9f0 != -1e9f) {
+ if (field_0x9f0 != -G_CM3D_F_INF) {
field_0xa02 = daNpcF_getGroundAngle(&mGndChk, shape_angle.y);
setEnvTevColor();
setRoomNo();
@@ -347,7 +347,7 @@ int daObj_YBag_c::Draw() {
mModel,
&tevStr);
mDoExt_modelUpdateDL(mModel);
- if (field_0x9f0 != -1e9f) {
+ if (field_0x9f0 != -G_CM3D_F_INF) {
fopAc_ac_c* grabActor = NULL;
s32 grabActorId = daPy_getPlayerActorClass()->getGrabActorID();
fopAcM_SearchByID(grabActorId, &grabActor);