mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-20 22:51:16 -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_yousei.cpp
+4 -4
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_yousei.h"
#include "d/d_com_inf_game.h"
@@ -41,7 +41,7 @@ void daObjYOUSEI_c::SetCcSph() {
int daObjYOUSEI_c::CreateHeap() {
void* modelData = dComIfG_getObjectRes("Always", 0x21);
JUT_ASSERT(177, modelData != 0);
JUT_ASSERT(177, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Always", 0xF), 2, 0.4f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL) {
@@ -626,7 +626,7 @@ void daObjYOUSEI_c::CheckGround() {
gnd_chk.SetPos(&pos);
pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (pos.y != -1000000000.0f) {
if (pos.y != -G_CM3D_F_INF) {
home.pos.y = pos.y;
}
}
@@ -638,7 +638,7 @@ bool daObjYOUSEI_c::CheckWater() {
gnd_chk.SetPos(&pos);
pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (-1000000000.0f != pos.y && dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 7 && current.pos.y - pos.y < 50.0f+ yREG_F(0)) {
if (-G_CM3D_F_INF != pos.y && dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 7 && current.pos.y - pos.y < 50.0f+ yREG_F(0)) {
return true;
}