mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-02 01:30:00 -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_flag.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_flag.h"
@@ -209,7 +209,7 @@ inline int daObjFlag_c::createHeap() {
current.angle.setall(0);
J3DModelData* modelData_flag = (J3DModelData*)dComIfG_getObjectRes("FlagObj", resName);
JUT_ASSERT(447, modelData_flag != 0)
JUT_ASSERT(447, modelData_flag != NULL)
mpModel1 = mDoExt_J3DModel__create(modelData_flag, 0x80000, 0x11000084);
for (u16 i = 0; i < 5; i++) {
@@ -223,7 +223,7 @@ inline int daObjFlag_c::createHeap() {
J3DModelData* modelData_pole =
(J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "model0.bmd");
JUT_ASSERT(464, modelData_pole != 0);
JUT_ASSERT(464, modelData_pole != NULL);
mpModel2 = mDoExt_J3DModel__create(modelData_pole, 0x80000, 0x11000084);
if (mpModel2 == NULL && tmp && mpModel1 == NULL) {
return 0;