diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-28 16:11:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-28 13:11:07 -0700 |
| commit | 9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch) | |
| tree | dde3385855941d12a306de3ca8fb316338be288b /src/d/actor/d_a_e_gi.cpp | |
| parent | c9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (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_e_gi.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_gi.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 034dcf2f2f..5094e8297c 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gi.h" #include "d/d_com_inf_game.h" @@ -342,7 +342,7 @@ void daE_GI_c::setDragSwordEffect() { gndchk.SetPos(&pos); f32 ground_height = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f != ground_height) { + if (-G_CM3D_F_INF != ground_height) { pos.y = ground_height; } @@ -1025,7 +1025,7 @@ static int daE_GI_Delete(daE_GI_c* a_this) { /* 806D00E8-806D025C 002D48 0174+00 1/1 0/0 0/0 .text CreateHeap__8daE_GI_cFv */ int daE_GI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x13); - JUT_ASSERT(1621, modelData != 0); + JUT_ASSERT(1621, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_GI", 0xB), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { @@ -1042,7 +1042,7 @@ int daE_GI_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x14); - JUT_ASSERT(1652, modelData != 0); + JUT_ASSERT(1652, modelData != NULL); mpSwordModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpSwordModel == NULL) { return 0; |