mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-23 23:35:16 -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_vt.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
* Variant Enemy (Death Sword)
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_e_vt.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -3733,7 +3733,7 @@ static int daE_VA_Delete(daE_VA_c* i_this) {
/* 807CD048-807CD600 00AB48 05B8+00 1/1 0/0 0/0 .text CreateHeap__8daE_VA_cFv */
int daE_VA_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 15), 0, 1.0f, 0,
@@ -3756,7 +3756,7 @@ int daE_VA_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x30);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpWeaponModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
if (mpWeaponModel == NULL) {
@@ -3776,7 +3776,7 @@ int daE_VA_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x37);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpEndEfMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 7), 0, 1.0f,
@@ -3843,7 +3843,7 @@ int daE_VA_c::CreateHeap() {
break;
}
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpCardModels[i] = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
}