mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-08 11:47:03 -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_scannon.cpp
+8 -8
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "f_op/f_op_camera_mng.h"
#include "d/actor/d_a_obj_scannon.h"
@@ -292,7 +292,7 @@ int daSCannon_c::createHeap() {
}
J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(arcname, bmd_index);
JUT_ASSERT(541, a_model_data_p != 0);
JUT_ASSERT(541, a_model_data_p != NULL);
mpModels[0] = mDoExt_J3DModel__create(a_model_data_p, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags);
if (mpModels[0] == NULL) {
@@ -301,7 +301,7 @@ int daSCannon_c::createHeap() {
if (layer_no == 3 || layer_no == 10) {
J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName_Comp, 5);
JUT_ASSERT(562, a_bck_p != 0);
JUT_ASSERT(562, a_bck_p != NULL);
int rt = mBck.init(a_bck_p, 1, 0, 0.0f, 0, -1, 0);
if (!rt) {
@@ -309,7 +309,7 @@ int daSCannon_c::createHeap() {
}
} else if (layer_no == 1) {
J3DModelData* a_repair_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName_Crash, 6);
JUT_ASSERT(583, a_repair_model_data_p != 0);
JUT_ASSERT(583, a_repair_model_data_p != NULL);
mpModels[1] = mDoExt_J3DModel__create(a_repair_model_data_p, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 0, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE));
if (mpModels[1] == NULL) {
@@ -318,21 +318,21 @@ int daSCannon_c::createHeap() {
if (mIsPortal != 0) {
J3DAnmTextureSRTKey* a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName_Crash, 9);
JUT_ASSERT(606, a_btk_p != 0);
JUT_ASSERT(606, a_btk_p != NULL);
mpCrashBtk = new mDoExt_btkAnm();
if (mpCrashBtk == NULL || !mpCrashBtk->init(a_model_data_p, a_btk_p, 1, 0, 0.0f, 0, -1)) {
return 0;
}
J3DModelData* a_ptl_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName_Ptl, 5);
JUT_ASSERT(623, a_ptl_model_data_p != 0);
JUT_ASSERT(623, a_ptl_model_data_p != NULL);
mpPtlModel = mDoExt_J3DModel__create(a_ptl_model_data_p, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE));
if (mpPtlModel == NULL) {
return 0;
}
a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName_Ptl, 0xC);
JUT_ASSERT(642, a_btk_p != 0);
JUT_ASSERT(642, a_btk_p != NULL);
mpPtlBtk = new mDoExt_btkAnm();
if (mpPtlBtk == NULL || !mpPtlBtk->init(a_ptl_model_data_p, a_btk_p, 1, 2, 0.0f, 0, -1)) {
return 0;
@@ -657,7 +657,7 @@ void daSCannon_c::demoInitFinish() {
if (joint_p == NULL) {
// "××××××Sky Cannon—The head joint is missing!!!! ××××××"
OS_REPORT("______________________××××××天空砲台　頭部分のジョイントがありません！！！！ ××××××____________\n");
JUT_ASSERT(1351, 0);
JUT_ASSERT(1351, FALSE);
}
}
#endif