mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-14 13:34:52 -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_kgate.cpp
+5 -5
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_kgate.h"
#include "SSystem/SComponent/c_math.h"
@@ -285,7 +285,7 @@ int daObjKGate_c::Create() {
int daObjKGate_c::CreateHeap() {
J3DModelData* modelData =
(J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateBmdIdx[mNameArg]);
JUT_ASSERT(500, modelData != 0);
JUT_ASSERT(500, modelData != NULL);
mpGateModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
mpGateModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -296,11 +296,11 @@ int daObjKGate_c::CreateHeap() {
if ((mNameArg == 0 || mNameArg == 2) && getSwNo() != 0xFF) {
modelData =
(J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateKeyIdx[mNameArg]);
JUT_ASSERT(524, modelData != 0);
JUT_ASSERT(524, modelData != NULL);
J3DModelData* modelData2 =
(J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateBmdIdx[mNameArg]);
JUT_ASSERT(530, modelData2 != 0);
JUT_ASSERT(530, modelData2 != NULL);
mDoExt_setupShareTexture(modelData, modelData2);
mpKeyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -310,7 +310,7 @@ int daObjKGate_c::CreateHeap() {
modelData =
(J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateHookIdx[mNameArg]);
JUT_ASSERT(546, modelData != 0);
JUT_ASSERT(546, modelData != NULL);
mDoExt_setupShareTexture(modelData, modelData2);
mpHookModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);