mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-24 23:53:12 -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
include/d/actor/d_a_formation_mng.h
+3 -3
View File
@@ -78,7 +78,7 @@ struct daFmtMng_Path_c {
} else {
field_0x4 = decIndex(field_0x4);
}
field_0x8 = 1000000000.0f;
field_0x8 = G_CM3D_F_INF;
}
void setNextPoint(cXyz *param_1) {
@@ -175,7 +175,7 @@ struct daFmtMng_c : public fopAc_ac_c {
int getEndTime() { return (fopAcM_GetParam(this) >> 24) & 0xff; }
void callExecute() {
JUT_ASSERT(680, mAction != 0);
JUT_ASSERT(680, mAction != NULL);
(this->*(mAction[1]))();
}
@@ -203,7 +203,7 @@ struct daFmtMng_c : public fopAc_ac_c {
}
void callInit() {
JUT_ASSERT(667, mAction != 0)
JUT_ASSERT(667, mAction != NULL)
(this->*(*mAction))();
}
include/d/actor/d_a_obj_boumato.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
cXyz sp2C;
cXyz sp20;
JUT_ASSERT(164, 0 != arrow_p);
JUT_ASSERT(164, NULL != arrow_p);
if (field_0xa38 != 0) {
return 0;
include/d/actor/d_a_obj_itamato.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
cXyz sp2C;
cXyz sp20;
JUT_ASSERT(170, 0 != arrow_p);
JUT_ASSERT(170, NULL != arrow_p);
if (field_0xa16 != 0 || health == 0) {
return 0;
include/d/actor/d_a_obj_sekizoa.h
+1 -1
View File
@@ -132,7 +132,7 @@ public:
void setWolfHowling() {
if (mType != 0) {
fopAc_ac_c* actor_p = mActorMngrs[3].getActorP();
JUT_ASSERT(0x1A3, 0 != actor_p);
JUT_ASSERT(0x1A3, NULL != actor_p);
((daObj_Sekizoa_c*)actor_p)->setWolfHowling();
} else {
include/d/actor/d_a_tag_kmsg.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
f32 getAttnPosOffset() {
u32 attnPosOffset = (fopAcM_GetParam(this) & 0xff0000) >> 0x10;
if (attnPosOffset == 0xff) {
return 1000000000.0f;
return G_CM3D_F_INF;
} else {
return attnPosOffset;
}
include/d/d_demo.h
+3 -3
View File
@@ -86,11 +86,11 @@ public:
/* 80038098 */ virtual ~dDemo_actor_c();
/* 800387EC */ virtual void JSGSetData(u32, void const*, u32);
/* 8003A05C */ virtual s32 JSGFindNodeID(char const* param_0) const {
JUT_ASSERT(0, mModel != 0);
JUT_ASSERT(0, mModel != NULL);
return mModel->getModelData()->getJointName()->getIndex(param_0);
}
/* 8003A088 */ virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const {
JUT_ASSERT(0, mModel != 0);
JUT_ASSERT(0, mModel != NULL);
cMtx_copy(mModel->getAnmMtx((u16)param_0), param_1);
return true;
}
@@ -375,7 +375,7 @@ public:
static jmessage_tControl* getMesgControl() { return m_mesgControl; }
static dDemo_camera_c* getCamera() {
JUT_ASSERT(0, m_object != 0);
JUT_ASSERT(0, m_object != NULL);
return m_object->getActiveCamera();
}
include/d/d_save.h
+29 -28
View File
@@ -9,35 +9,36 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JHostIO/JORReflexible.h"
#define DEFAULT_SELECT_ITEM_INDEX 0
#define MAX_SELECT_ITEM 4
#define SELECT_ITEM_NUM 2
#define MAX_EQUIPMENT 6
#define MAX_EVENTS 256
#define MAX_ITEM_SLOTS 24
#define LIGHT_DROP_STAGE 4
#define LETTER_INFO_BIT 64
#define MAX_INSECT_NUM 24
#define MAX_VISIBLE_HEARTPIECES 4
#define MAX_POH_NUM 100
#define TBOX_MAX 64
#define DSV_MEMBIT_ENUM_MAX 8
#define ITEM_MAX_DAN 128
#define SWITCH_ZONE_MAX 0x20
#define SWITCH_ONE_ZONE_MAX 0x10
#define ITEM_ZONE_MAX 0x20
#define ITEM_ONE_ZONE_MAX 0x10
#define QUEST_LOG_SIZE 0xA94
#define QUIVER_MAX 30
#define BIG_QUIVER_MAX 60
#define GIANT_QUIVER_MAX 100
#define WALLET_MAX 300
#define BIG_WALLET_MAX 600
#define GIANT_WALLET_MAX 1000
#define MAX_FINDABLE_FISHES 6
#define ITEM_XY_MAX_DUMMY 8
#define ITEM_BIT_MAX 0x100
static const int DEFAULT_SELECT_ITEM_INDEX = 0;
static const int MAX_SELECT_ITEM = 4;
static const int SELECT_ITEM_NUM = 2;
static const int MAX_EQUIPMENT = 6;
static const int MAX_EVENTS = 256;
static const int MAX_ITEM_SLOTS = 24;
static const int LIGHT_DROP_STAGE = 4;
static const int LETTER_INFO_BIT = 64;
static const int MAX_INSECT_NUM = 24;
static const int MAX_VISIBLE_HEARTPIECES = 4;
static const int MAX_POH_NUM = 100;
static const int TBOX_MAX = 64;
static const int DSV_MEMBIT_ENUM_MAX = 8;
static const int ITEM_MAX_DAN = 128;
static const int SWITCH_ZONE_MAX = 0x20;
static const int SWITCH_ONE_ZONE_MAX = 0x10;
static const int ITEM_ZONE_MAX = 0x20;
static const int ITEM_ONE_ZONE_MAX = 0x10;
static const int QUEST_LOG_SIZE = 0xA94;
static const int QUIVER_MAX = 30;
static const int BIG_QUIVER_MAX = 60;
static const int GIANT_QUIVER_MAX = 100;
static const int WALLET_MAX = 300;
static const int BIG_WALLET_MAX = 600;
static const int GIANT_WALLET_MAX = 1000;
static const int MAX_FINDABLE_FISHES = 6;
static const int ITEM_BIT_MAX = 0x100;
static const int ITEM_XY_MAX_DUMMY = 8;
enum ButtonIndexes {
/* 0 */ A_BUTTON,
include/d/d_stage.h
+48 -48
View File
@@ -581,22 +581,22 @@ public:
(void)i_LightVecInfo;
dStage_SetErrorStage();
OSReport("stage non LightVec data !!\n");
JUT_ASSERT(3003, 0);
JUT_ASSERT(3003, FALSE);
}
/* vt[43] */ virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const {
OSReport("stage non LightVec data !!\n");
JUT_ASSERT(3007, 0);
JUT_ASSERT(3007, FALSE);
return NULL;
}
/* vt[44] */ virtual void setLightVecInfoNum(int i_LightVecInfoNum) {
(void)i_LightVecInfoNum;
dStage_SetErrorStage();
OSReport("stage non LightVecNum data !!\n");
JUT_ASSERT(3014, 0);
JUT_ASSERT(3014, FALSE);
}
/* vt[45] */ virtual int getLightVecInfoNum(void) const {
OSReport("stage non LightVecNum data !!\n");
JUT_ASSERT(3018, 0);
JUT_ASSERT(3018, FALSE);
return NULL;
}
/* vt[40] */ virtual void setPlightNumInfo(int i_PlightNumInfo) { mPlightNumInfo = i_PlightNumInfo; }
@@ -623,22 +623,22 @@ public:
(void)list;
dStage_SetErrorStage();
OSReport("stage non filelist2 data!\n");
JUT_ASSERT(3123, 0);
JUT_ASSERT(3123, FALSE);
}
/* vt[65] */ virtual dStage_FileList2_dt_c* getFileList2Info(void) const {
OSReport("stage non filelist2 data!\n");
JUT_ASSERT(3127, 0);
JUT_ASSERT(3127, FALSE);
return NULL;
}
/* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c* list) {
(void)list;
dStage_SetErrorStage();
OSReport("stage non filelist data!\n");
JUT_ASSERT(3138, 0);
JUT_ASSERT(3138, FALSE);
}
/* vt[67] */ virtual dStage_FileList_dt_c* getFileListInfo(void) const {
OSReport("stage non filelist data!\n");
JUT_ASSERT(3142, 0);
JUT_ASSERT(3142, FALSE);
return NULL;
}
/* vt[68] */ virtual void setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { mFloorInfo = i_FloorInfo; }
@@ -656,11 +656,11 @@ public:
(void)lbnk;
dStage_SetErrorStage();
OSReport("stage non Lbnk data!\n");
JUT_ASSERT(3231, 0);
JUT_ASSERT(3231, FALSE);
}
/* vt[80] */ virtual dStage_Lbnk_c* getLbnk(void) const {
OSReport("stage non Lbnk data!\n");
JUT_ASSERT(3238, 0);
JUT_ASSERT(3238, FALSE);
return NULL;
}
/* vt[81] */ virtual void setTresure(stage_tresure_class* i_Tresure) { mTresure = i_Tresure; }
@@ -741,11 +741,11 @@ public:
(void)i_Room;
dStage_SetErrorRoom();
OSReport("Room non room data !!\n");
JUT_ASSERT(2095, 0);
JUT_ASSERT(2095, FALSE);
}
virtual roomRead_class* getRoom(void) const {
OSReport("Room non room data !!\n");
JUT_ASSERT(2100, 0);
JUT_ASSERT(2100, FALSE);
return NULL;
}
virtual void setMapInfo(stage_map_info_class* i_MapInfo) { mMapInfo = i_MapInfo; }
@@ -757,33 +757,33 @@ public:
(void)i_PaletteInfo;
dStage_SetErrorRoom();
OSReport("Room non palet data !!\n");
JUT_ASSERT(2126, 0);
JUT_ASSERT(2126, FALSE);
}
virtual stage_palette_info_class* getPaletteInfo(void) const {
OSReport("Room non palet data !!\n");
JUT_ASSERT(2130, 0);
JUT_ASSERT(2130, FALSE);
return NULL;
}
virtual void setPselectInfo(stage_pselect_info_class* i_PselectInfo) {
(void)i_PselectInfo;
dStage_SetErrorRoom();
OSReport("Room non pselect data !!\n");
JUT_ASSERT(2137, 0);
JUT_ASSERT(2137, FALSE);
}
virtual stage_pselect_info_class* getPselectInfo(void) const {
OSReport("Room non pselect data !!\n");
JUT_ASSERT(2141, 0);
JUT_ASSERT(2141, FALSE);
return NULL;
}
virtual void setEnvrInfo(stage_envr_info_class* i_EnvrInfo) {
(void)i_EnvrInfo;
dStage_SetErrorRoom();
OSReport("Room non envr data !!\n");
JUT_ASSERT(2148, 0);
JUT_ASSERT(2148, FALSE);
}
virtual stage_envr_info_class* getEnvrInfo(void) const {
OSReport("Room non envr data !!\n");
JUT_ASSERT(2152, 0);
JUT_ASSERT(2152, FALSE);
return NULL;
}
virtual void setVrboxInfo(stage_vrbox_info_class* i_VrboxInfo) { mVrboxInfo = i_VrboxInfo; }
@@ -794,44 +794,44 @@ public:
(void)i_PlightInfo;
dStage_SetErrorRoom();
OSReport("Room non plight data !!\n");
JUT_ASSERT(2174, 0);
JUT_ASSERT(2174, FALSE);
}
virtual stage_plight_info_class* getPlightInfo(void) const {
OSReport("Room non plight data !!\n");
JUT_ASSERT(2178, 0);
JUT_ASSERT(2178, FALSE);
return NULL;
}
virtual void setPaletteNumInfo(int i_PaletteNumInfo) {
(void)i_PaletteNumInfo;
dStage_SetErrorRoom();
OSReport("Room non palette num data !!\n");
JUT_ASSERT(2186, 0);
JUT_ASSERT(2186, FALSE);
}
virtual int getPaletteNumInfo(void) const {
OSReport("Room non palette num data !!\n");
JUT_ASSERT(2190, 0);
JUT_ASSERT(2190, FALSE);
return NULL;
}
virtual void setPselectNumInfo(int i_PselectNumInfo) {
(void)i_PselectNumInfo;
dStage_SetErrorRoom();
OSReport("Room non pselect num data !!\n");
JUT_ASSERT(2197, 0);
JUT_ASSERT(2197, FALSE);
}
virtual int getPselectNumInfo(void) const {
OSReport("Room non pselect num data !!\n");
JUT_ASSERT(2201, 0);
JUT_ASSERT(2201, FALSE);
return NULL;
}
virtual void setEnvrNumInfo(int i_EnvrNumInfo) {
(void)i_EnvrNumInfo;
dStage_SetErrorRoom();
OSReport("Room non envr num data !!\n");
JUT_ASSERT(2208, 0);
JUT_ASSERT(2208, FALSE);
}
virtual int getEnvrNumInfo(void) const {
OSReport("Room non envr num data !!\n");
JUT_ASSERT(2212, 0);
JUT_ASSERT(2212, FALSE);
return NULL;
}
virtual void setVrboxNumInfo(int i_VrboxNumInfo) { mVrboxNumInfo = i_VrboxNumInfo; }
@@ -842,11 +842,11 @@ public:
(void)i_PlightNumInfo;
dStage_SetErrorRoom();
OSReport("Room non plight num data !!\n");
JUT_ASSERT(2223, 0);
JUT_ASSERT(2223, FALSE);
}
virtual int getPlightNumInfo(void) const {
OSReport("Room non plight num data !!\n");
JUT_ASSERT(2227, 0);
JUT_ASSERT(2227, FALSE);
return NULL;
}
virtual void setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { mLightVecInfo = i_LightVecInfo; }
@@ -857,11 +857,11 @@ public:
(void)i_StagInfo;
dStage_SetErrorRoom();
OSReport("Room non stag data !!\n");
JUT_ASSERT(2256, 0);
JUT_ASSERT(2256, FALSE);
}
virtual stage_stag_info_class* getStagInfo(void) const {
OSReport("Room non stag data !!\n");
JUT_ASSERT(2260, 0);
JUT_ASSERT(2260, FALSE);
return NULL;
}
virtual void setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { mSclsInfo = i_SclsInfo; }
@@ -870,22 +870,22 @@ public:
(void)i_PntInfo;
dStage_SetErrorRoom();
OSReport("Room non Pnt data !\n");
JUT_ASSERT(2281, 0);
JUT_ASSERT(2281, FALSE);
}
virtual dStage_dPnt_c* getPntInf(void) const {
OSReport("Room non Pnts data !\n");
JUT_ASSERT(2285, 0);
JUT_ASSERT(2285, FALSE);
return NULL;
}
virtual void setPathInfo(dStage_dPath_c* i_PathInfo) {
(void)i_PathInfo;
dStage_SetErrorRoom();
OSReport("Room non Path data !\n");
JUT_ASSERT(2292, 0);
JUT_ASSERT(2292, FALSE);
}
virtual dStage_dPath_c* getPathInf(void) const {
OSReport("Room non Path data !\n");
JUT_ASSERT(2296, 0);
JUT_ASSERT(2296, FALSE);
return NULL;
}
virtual void setPnt2Info(dStage_dPnt_c* i_Pnt2Info) { mPnt2Info = i_Pnt2Info; }
@@ -907,44 +907,44 @@ public:
virtual void setMemoryConfig(dStage_MemoryConfig_c* i_MemoryConfig) {
(void)i_MemoryConfig;
OSReport("Room non memory config data!\n");
JUT_ASSERT(2414, 0);
JUT_ASSERT(2414, FALSE);
}
virtual dStage_MemoryConfig_c* getMemoryConfig(void) const {
OSReport("Room non memory config data!\n");
JUT_ASSERT(2423, 0);
JUT_ASSERT(2423, FALSE);
return NULL;
}
virtual void setMemoryMap(dStage_MemoryMap_c* i_MemoryMap) {
(void)i_MemoryMap;
OSReport("Room non memory map data!\n");
JUT_ASSERT(2433, 0);
JUT_ASSERT(2433, FALSE);
}
virtual dStage_MemoryMap_c* getMemoryMap(void) const {
OSReport("Room non memory map data!\n");
JUT_ASSERT(2442, 0);
JUT_ASSERT(2442, FALSE);
return NULL;
}
virtual void setMulti(dStage_Multi_c* i_Multi) {
(void)i_Multi;
OSReport("Room non multi data!\n");
JUT_ASSERT(2452, 0);
JUT_ASSERT(2452, FALSE);
}
virtual dStage_Multi_c* getMulti(void) const {
OSReport("Room non multi data!\n");
JUT_ASSERT(2457, 0);
JUT_ASSERT(2457, FALSE);
return NULL;
}
virtual void setOldMulti(void) {
OSReport("Room non old multi data!\n");
JUT_ASSERT(2462, 0);
JUT_ASSERT(2462, FALSE);
}
virtual void resetOldMulti(void) {
OSReport("Room non old multi data!\n");
JUT_ASSERT(2467, 0);
JUT_ASSERT(2467, FALSE);
}
virtual dStage_Multi_c* getOldMulti(void) const {
OSReport("Room non old multi data!\n");
JUT_ASSERT(2472, 0);
JUT_ASSERT(2472, FALSE);
return NULL;
}
virtual void setLbnk(dStage_Lbnk_c* i_Lbnk) { mLbnk = i_Lbnk; }
@@ -954,11 +954,11 @@ public:
virtual void setDMap(dStage_DMap_c* i_DMap) {
(void)i_DMap;
OS_REPORT("Room non DMap data\n");
JUT_ASSERT(2508, 0);
JUT_ASSERT(2508, FALSE);
}
virtual dStage_DMap_c* getDMap(void) const {
OS_REPORT("Room non DMap data\n");
JUT_ASSERT(2513, 0);
JUT_ASSERT(2513, FALSE);
return NULL;
}
virtual void setDrTg(stage_tgsc_class* i_DrTg) { mDrTg = i_DrTg; }
@@ -968,18 +968,18 @@ public:
virtual void setMapPath(void* i_MapPath) {
(void)i_MapPath;
OSReport("stage non 2d map path data !!\n");
JUT_ASSERT(2557, 0);
JUT_ASSERT(2557, FALSE);
}
virtual void* getMapPath(void) {
OSReport("stage non 2d map path data !!\n");
JUT_ASSERT(2561, 0);
JUT_ASSERT(2561, FALSE);
return NULL;
}
virtual void setElst(dStage_Elst_c* i_Elst) {
(void)i_Elst;
dStage_SetErrorRoom();
OSReport("Room non envLayserSet data\n");
JUT_ASSERT(2572, 0);
JUT_ASSERT(2572, FALSE);
}
virtual dStage_Elst_c* getElst(void) {
dStage_SetErrorRoom();