mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-08 03:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JUT_ASSERT and several other macros (#2711)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_kago.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_kago.h"
#include "SSystem/SComponent/c_counter.h"
@@ -120,7 +120,7 @@ cPhs__Step daObj_Kago_c::create() {
mObjAcch.CrrPos(dComIfG_Bgsp());
field_0x7cc = mObjAcch.m_gnd;
mGroundH = mObjAcch.GetGroundH();
if (mGroundH != -1000000000.0f) {
if (mGroundH != -G_CM3D_F_INF) {
setEnvTevColor();
setRoomNo();
}
@@ -236,7 +236,7 @@ int daObj_Kago_c::Execute() {
cXyz sp80;
sp_0x8 = 0x80;
fopAcM_getWaterY(&current.pos, &mWaterY);
if (mWaterY != -1000000000.0f && reg_f30 < (mWaterY - mGroundH) && current.pos.y <= mWaterY) {
if (mWaterY != -G_CM3D_F_INF && reg_f30 < (mWaterY - mGroundH) && current.pos.y <= mWaterY) {
if (field_0xb9d == 0) {
speedF *= 0.3f;
speed.y *= 0.5f;
@@ -430,7 +430,7 @@ int daObj_Kago_c::Execute() {
mObjAcch.CrrPos(dComIfG_Bgsp());
field_0x7cc = mObjAcch.m_gnd;
mGroundH = mObjAcch.GetGroundH();
if (mGroundH != -1000000000.0f) {
if (mGroundH != -G_CM3D_F_INF) {
field_0xb6e = daNpcF_getGroundAngle(&field_0x7cc, shape_angle.y);
setEnvTevColor();
setRoomNo();
@@ -494,7 +494,7 @@ int daObj_Kago_c::Draw() {
fopAcM_SearchByID(daPy_getPlayerActorClass()->getGrabActorID(), &basket_p);
if (this == basket_p) {
model = field_0x574;
} else if (mGroundH != -1000000000.0f) {
} else if (mGroundH != -G_CM3D_F_INF) {
field_0xb78 = dComIfGd_setShadow(field_0xb78, 1, field_0x574, &current.pos,
daObj_Kago_Param_c::m.field_0x0c, 20.0f,
current.pos.y, mGroundH, field_0x7cc, &tevStr,