mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-12 13:04:38 -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_kag.cpp
+3 -3
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_kag.h"
#include "d/d_menu_insect.h"
@@ -95,7 +95,7 @@ static int const l_kag_btk_index[2] = {
int daObjKAG_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kag", BMDE_KAG);
JUT_ASSERT(246, modelData != 0);
JUT_ASSERT(246, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
@@ -539,7 +539,7 @@ void daObjKAG_c::checkGroundPos() {
mGndChk.SetPos(&sp28);
f32 fVar1 = dComIfG_Bgsp().GroundCross(&mGndChk);
if (fVar1 != -1e9f) {
if (fVar1 != -G_CM3D_F_INF) {
field_0x81c = fVar1;
}
}