mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 00:13:05 -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_e_gm.cpp
+4 -4
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_e_gm.h"
#include "f_op/f_op_actor_enemy.h"
@@ -1713,7 +1713,7 @@ int daE_GM_c::CreateHeap() {
if (mType == TYPE_GOMA) {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_mg", BMDV_MD);
JUT_ASSERT(2683, modelData != 0);
JUT_ASSERT(2683, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9),
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);
@@ -1721,7 +1721,7 @@ int daE_GM_c::CreateHeap() {
if (mType != TYPE_NORMAL) {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_gm", BMDE_GOMA_EGG);
JUT_ASSERT(2701, modelData != 0);
JUT_ASSERT(2701, modelData != NULL);
mpEggModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
if (mpEggModel == NULL) {
@@ -1731,7 +1731,7 @@ int daE_GM_c::CreateHeap() {
modelData = (J3DModelData*)dComIfG_getObjectRes("E_gm", BMDV_GB);
JUT_ASSERT(2714, modelData != 0);
JUT_ASSERT(2714, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR),
0, 1.0f, 0, -1, &mSound, 0, 0x11000084);