mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-31 08:51:29 -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_flag3.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_flag3.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
@@ -310,7 +310,7 @@ int daObjFlag3_c::createHeap() {
shape_angle.setall(0);
current.angle.setall(0);
ResTIMG* image = (ResTIMG*)dComIfG_getObjectRes(mFlagName, "flag.bti");
JUT_ASSERT(838, image != 0);
JUT_ASSERT(838, image != NULL);
GXInitTexObj(mFlagCloth.getImageTexObj(), (u8*)image + image->imageOffset, image->width,
image->height, (GXTexFmt)image->format, (GXTexWrapMode)image->wrapS,
(GXTexWrapMode)image->wrapT, image->mipmapCount > 1 ? GX_TRUE : GX_FALSE);
@@ -322,7 +322,7 @@ int daObjFlag3_c::createHeap() {
}
}
J3DModelData* modelData_pole = (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "model0.bmd");
JUT_ASSERT(865, modelData_pole != 0);
JUT_ASSERT(865, modelData_pole != NULL);
mModel = mDoExt_J3DModel__create(modelData_pole, 0x80000, 0x11000084);
return mModel != NULL ? TRUE : FALSE;
}