mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-18 06:15:20 -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_sakuita.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_obj_sakuita.h"
#include "d/d_a_obj.h"
@@ -76,7 +76,7 @@ void daObjSakuita_c::create_init() {
field_0x728 = field_0x71c;
initBaseMtx();
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd");
JUT_ASSERT(210, modelData != 0);
JUT_ASSERT(210, modelData != NULL);
if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0) == -1) {
OS_REPORT("\x1B[43;30mカラカラ板：シンプルモデル登録失敗しました。\n\x1B[m");
}
@@ -145,7 +145,7 @@ void daObjSakuita_c::calcAngle() {
inline int daObjSakuita_c::createHeap() {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd");
JUT_ASSERT(567, modelData != 0);
JUT_ASSERT(567, modelData != NULL);
mModel = mDoExt_J3DModel__create(modelData, 0x20000, 0x11000084);
return mModel != NULL ? 1 : 0;
}
@@ -201,7 +201,7 @@ daObjSakuita_c::~daObjSakuita_c() {
if (field_0x74c != 0) {
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd");
JUT_ASSERT(160, modelData != 0);
JUT_ASSERT(160, modelData != NULL);
dComIfGp_removeSimpleModel(modelData, fopAcM_GetRoomNo(this));
}
dComIfG_resDelete(&mPhase, l_arcName);