From c836c5ca1f14fa629a82e02ea74fb681a7c94e6b Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 22 Jun 2024 10:10:07 -0400 Subject: [PATCH] Use FALSE macro in asserts, remove JUT_PANIC macro --- include/JSystem/JUtility/JUTAssert.h | 4 -- include/d/d_stage.h | 88 ++++++++++++++-------------- src/DynamicLink.cpp | 2 +- src/JSystem/JAudio/JASBasicInst.cpp | 2 +- src/JSystem/JAudio/JASDrumSet.cpp | 2 +- src/d/actor/d_a_mbdoor.cpp | 2 +- src/d/actor/d_a_mtoge.cpp | 2 +- src/d/actor/d_a_obj_AjavW.cpp | 2 +- src/d/actor/d_a_obj_Vteng.cpp | 2 +- src/d/actor/d_a_obj_Ygush00.cpp | 2 +- src/d/actor/d_a_obj_barrier.cpp | 4 +- src/d/actor/d_a_obj_ganonbed.cpp | 2 +- src/d/actor/d_a_obj_gryw00.cpp | 2 +- src/d/actor/d_a_obj_hfuck1.cpp | 2 +- src/d/actor/d_a_player_fan.inc | 2 +- src/d/actor/d_a_player_main.cpp | 16 ++--- src/d/actor/d_a_player_sword.inc | 2 +- src/d/actor/d_a_tag_island.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 2 +- src/d/d_event.cpp | 22 +++---- src/d/d_event_data.cpp | 26 ++++---- src/d/d_event_manager.cpp | 14 ++--- src/f_op/f_op_actor_mng.cpp | 2 +- src/f_op/f_op_msg_mng.cpp | 2 +- src/f_op/f_op_scene_mng.cpp | 2 +- src/f_pc/f_pc_deletor.cpp | 2 +- 26 files changed, 104 insertions(+), 108 deletions(-) diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 1f9d608d6..4975cf2d8 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -18,10 +18,6 @@ } \ } -#define JUT_PANIC(LINE) \ - JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, "0"); \ - OSPanic(__FILE__, LINE, "Halt"); - #define JUT_WARN(LINE, ...) \ JUTAssertion::setWarningMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__); \ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 1e33ea2d6..ea0ffe21d 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -454,21 +454,21 @@ public: /* vt[39] */ virtual void setLightVecInfo(stage_lightvec_info_class*) { dStage_SetErrorStage(); OSReport("stage non LightVec data !!\n"); - JUT_ASSERT(2380, 0); + JUT_ASSERT(2380, FALSE); } /* vt[40] */ virtual stage_lightvec_info_class* getLightVecInfo() const { OSReport("stage non LightVec data !!\n"); - JUT_ASSERT(2384, 0); + JUT_ASSERT(2384, FALSE); return NULL; } /* vt[41] */ virtual void setLightVecInfoNum(int) { dStage_SetErrorStage(); OSReport("stage non LightVecNum data !!\n"); - JUT_ASSERT(2391, 0); + JUT_ASSERT(2391, FALSE); } /* vt[42] */ virtual int getLightVecInfoNum() const { OSReport("stage non LightVecNum data !!\n"); - JUT_ASSERT(2395, 0); + JUT_ASSERT(2395, FALSE); return 0; } /* vt[37] */ virtual void setPlightNumInfo(int i_plightNum) { mPlightInfoNum = i_plightNum; } @@ -492,11 +492,11 @@ public: /* vt[59] */ virtual void setFileListInfo(dStage_FileList_dt_c*) { dStage_SetErrorStage(); OSReport("stage non filelist data!\n"); - JUT_ASSERT(2490, 0); + JUT_ASSERT(2490, FALSE); } /* vt[60] */ virtual dStage_FileList_dt_c* getFileListInfo() const { OSReport("stage non filelist data!\n"); - JUT_ASSERT(2494, 0); + JUT_ASSERT(2494, FALSE); return NULL; } /* vt[61] */ virtual void setFloorInfo(dStage_FloorInfo_c* i_floorInfo) { mpFloorInfo = i_floorInfo; } @@ -508,11 +508,11 @@ public: /* vt[67] */ virtual void setShip(dStage_Ship_c*) { dStage_SetErrorStage(); OSReport("stage non SHIP data!\n"); - JUT_ASSERT(2561, 0); + JUT_ASSERT(2561, FALSE); } /* vt[68] */ virtual dStage_Ship_c* getShip() const { OSReport("stage non SHIP data!\n"); - JUT_ASSERT(2565, 0); + JUT_ASSERT(2565, FALSE); return NULL; } /* vt[69] */ virtual void setMulti(dStage_Multi_c* i_multi) { mpMulti = i_multi; } @@ -520,11 +520,11 @@ public: /* vt[71] */ virtual void setLbnk(dStage_Lbnk_c*) { dStage_SetErrorStage(); OSReport("stage non Lbnk data!\n"); - JUT_ASSERT(2590, 0); + JUT_ASSERT(2590, FALSE); } /* vt[72] */ virtual dStage_Lbnk_c* getLbnk() const { OSReport("stage non Lbnk data!\n"); - JUT_ASSERT(2597, 0); + JUT_ASSERT(2597, FALSE); return NULL; } /* vt[73] */ virtual void setTresure(stage_tresure_class* i_tresure) { mpTresure = i_tresure; } @@ -584,11 +584,11 @@ public: /* vt[12] */ virtual void setRoom(roomRead_class*) { dStage_SetErrorRoom(); OSReport("Room non room data !!\n"); - JUT_ASSERT(1613, 0); + JUT_ASSERT(1613, FALSE); } /* vt[13] */ virtual roomRead_class* getRoom() const { OSReport("Room non room data !!\n"); - JUT_ASSERT(1618, 0); + JUT_ASSERT(1618, FALSE); return NULL; } /* vt[14] */ virtual void setMapInfo(stage_map_info_class* i_mapInfo) { mpMapInfo = i_mapInfo; } @@ -599,31 +599,31 @@ public: /* vt[19] */ virtual void setPaletInfo(stage_palet_info_class*) { dStage_SetErrorRoom(); OSReport("Room non palet data !!\n"); - JUT_ASSERT(1644, 0); + JUT_ASSERT(1644, FALSE); } /* vt[20] */ virtual stage_palet_info_class* getPaletInfo() const { OSReport("Room non palet data !!\n"); - JUT_ASSERT(1648, 0); + JUT_ASSERT(1648, FALSE); return NULL; } /* vt[21] */ virtual void setPselectInfo(stage_pselect_info_class*) { dStage_SetErrorRoom(); OSReport("Room non pselect data !!\n"); - JUT_ASSERT(1655, 0); + JUT_ASSERT(1655, FALSE); } /* vt[22] */ virtual stage_pselect_info_class* getPselectInfo() const { OSReport("Room non pselect data !!\n"); - JUT_ASSERT(1659, 0); + JUT_ASSERT(1659, FALSE); return NULL; } /* vt[23] */ virtual void setEnvrInfo(stage_envr_info_class*) { dStage_SetErrorRoom(); OSReport("Room non envr data !!\n"); - JUT_ASSERT(1666, 0); + JUT_ASSERT(1666, FALSE); } /* vt[24] */ virtual stage_envr_info_class* getEnvrInfo() const { OSReport("Room non envr data !!\n"); - JUT_ASSERT(1670, 0); + JUT_ASSERT(1670, FALSE); return NULL; } /* vt[25] */ virtual void setVrboxInfo(stage_vrbox_info_class* i_vrbox) { mpVrbox = i_vrbox; } @@ -631,41 +631,41 @@ public: /* vt[27] */ virtual void setPlightInfo(stage_plight_info_class*) { dStage_SetErrorRoom(); OSReport("Room non plight data !!\n"); - JUT_ASSERT(1686, 0); + JUT_ASSERT(1686, FALSE); } /* vt[28] */ virtual stage_plight_info_class* getPlightInfo() const { OSReport("Room non plight data !!\n"); - JUT_ASSERT(1690, 0); + JUT_ASSERT(1690, FALSE); return NULL; } /* vt[29] */ virtual void setPaletNumInfo(int) { dStage_SetErrorRoom(); OSReport("Room non palet num data !!\n"); - JUT_ASSERT(1700, 0); + JUT_ASSERT(1700, FALSE); } /* vt[30] */ virtual int getPaletNumInfo() const { OSReport("Room non palet num data !!\n"); - JUT_ASSERT(1704, 0); + JUT_ASSERT(1704, FALSE); return 0; } /* vt[31] */ virtual void setPselectNumInfo(int) { dStage_SetErrorRoom(); OSReport("Room non pselect num data !!\n"); - JUT_ASSERT(1711, 0); + JUT_ASSERT(1711, FALSE); } /* vt[32] */ virtual int getPselectNumInfo() const { OSReport("Room non pselect num data !!\n"); - JUT_ASSERT(1715, 0); + JUT_ASSERT(1715, FALSE); return 0; } /* vt[33] */ virtual void setEnvrNumInfo(int) { dStage_SetErrorRoom(); OSReport("Room non envr num data !!\n"); - JUT_ASSERT(1722, 0); + JUT_ASSERT(1722, FALSE); } /* vt[34] */ virtual int getEnvrNumInfo() const { OSReport("Room non envr num data !!\n"); - JUT_ASSERT(1726, 0); + JUT_ASSERT(1726, FALSE); return 0; } /* vt[35] */ virtual void setVrboxNumInfo(int i_vrboxNum) { mVrboxNum = i_vrboxNum; } @@ -673,11 +673,11 @@ public: /* vt[37] */ virtual void setPlightNumInfo(int) { dStage_SetErrorRoom(); OSReport("Room non plight num data !!\n"); - JUT_ASSERT(1735, 0); + JUT_ASSERT(1735, FALSE); } /* vt[38] */ virtual int getPlightNumInfo() const { OSReport("Room non plight num data !!\n"); - JUT_ASSERT(1740, 0); + JUT_ASSERT(1740, FALSE); return 0; } /* vt[39] */ virtual void setLightVecInfo(stage_lightvec_info_class* i_lightvecInfo) { mpLightVecInfo = i_lightvecInfo; } @@ -687,11 +687,11 @@ public: /* vt[43] */ virtual void setStagInfo(stage_stag_info_class*) { dStage_SetErrorRoom(); OSReport("Room non stag data !!\n"); - JUT_ASSERT(1769, 0); + JUT_ASSERT(1769, FALSE); } /* vt[44] */ virtual stage_stag_info_class* getStagInfo() const { OSReport("Room non stag data !!\n"); - JUT_ASSERT(1773, 0); + JUT_ASSERT(1773, FALSE); return NULL; } /* vt[45] */ virtual void setSclsInfo(stage_scls_info_dummy_class* i_scls) { mpScls = i_scls; } @@ -699,21 +699,21 @@ public: /* vt[47] */ virtual void setPntInfo(dStage_dPnt_c*) { dStage_SetErrorRoom(); OSReport("Room non Pnt data !\n"); - JUT_ASSERT(1794, 0); + JUT_ASSERT(1794, FALSE); } /* vt[48] */ virtual dStage_dPnt_c* getPntInf() const { OSReport("Room non Pnts data !\n"); - JUT_ASSERT(1798, 0); + JUT_ASSERT(1798, FALSE); return NULL; } /* vt[49] */ virtual void setPathInfo(dStage_dPath_c*) { dStage_SetErrorRoom(); OSReport("Room non Path data !\n"); - JUT_ASSERT(1805, 0); + JUT_ASSERT(1805, FALSE); } /* vt[50] */ virtual dStage_dPath_c* getPathInf() const { OSReport("Room non Path data !\n"); - JUT_ASSERT(1809, 0); + JUT_ASSERT(1809, FALSE); return NULL; } /* vt[51] */ virtual void setPnt2Info(dStage_dPnt_c* i_pnt) { mpPoint2 = i_pnt; } @@ -725,11 +725,11 @@ public: /* vt[57] */ virtual void setEventInfo(dStage_EventInfo_c*) { dStage_SetErrorRoom(); OSReport("Room non event data!\n"); - JUT_ASSERT(1850, 0); + JUT_ASSERT(1850, FALSE); } /* vt[58] */ virtual dStage_EventInfo_c* getEventInfo() const { OSReport("Room non event data!\n"); - JUT_ASSERT(1854, 0); + JUT_ASSERT(1854, FALSE); return NULL; } /* vt[59] */ virtual void setFileListInfo(dStage_FileList_dt_c* i_filelist) { mpFileList = i_filelist; } @@ -738,40 +738,40 @@ public: /* vt[62] */ virtual dStage_FloorInfo_c* getFloorInfo() const { return mpFloor; } /* vt[63] */ virtual void setMemoryConfig(dStage_MemoryConfig_c*) { OSReport("Room non memory config data!\n"); - JUT_ASSERT(1900, 0); + JUT_ASSERT(1900, FALSE); } /* vt[64] */ virtual dStage_MemoryConfig_c* getMemoryConfig() const { OSReport("Room non memory config data!\n"); - JUT_ASSERT(1909, 0); + JUT_ASSERT(1909, FALSE); return NULL; } /* vt[65] */ virtual void setMemoryMap(dStage_MemoryMap_c*) { OSReport("Room non memory map data!\n"); - JUT_ASSERT(1919, 0); + JUT_ASSERT(1919, FALSE); } /* vt[66] */ virtual dStage_MemoryMap_c* getMemoryMap() const { OSReport("Room non memory map data!\n"); - JUT_ASSERT(1928, 0); + JUT_ASSERT(1928, FALSE); return NULL; } /* vt[67] */ virtual void setShip(dStage_Ship_c* i_ship) { mpShip = i_ship; } /* vt[68] */ virtual dStage_Ship_c* getShip() const { return mpShip; } /* vt[69] */ virtual void setMulti(dStage_Multi_c*) { OSReport("Room non multi data!\n"); - JUT_ASSERT(1961, 0); + JUT_ASSERT(1961, FALSE); } /* vt[70] */ virtual dStage_Multi_c* getMulti() const { OSReport("Room non multi data!\n"); - JUT_ASSERT(1966, 0); + JUT_ASSERT(1966, FALSE); return NULL; } /* vt[71] */ virtual void setLbnk(dStage_Lbnk_c* i_lbnk) { mpLbnk = i_lbnk; } /* vt[72] */ virtual dStage_Lbnk_c* getLbnk() const { return mpLbnk; } /* vt[73] */ virtual void setTresure(stage_tresure_class* i_tresure) { mpTresure = i_tresure; } /* vt[74] */ virtual stage_tresure_class* getTresure() const { return mpTresure; } - /* vt[75] */ virtual void setDMap(dStage_DMap_c*) { JUT_ASSERT(2002, 0); } + /* vt[75] */ virtual void setDMap(dStage_DMap_c*) { JUT_ASSERT(2002, FALSE); } /* vt[76] */ virtual dStage_DMap_c* getDMap() const { - JUT_ASSERT(2007, 0); + JUT_ASSERT(2007, FALSE); return NULL; } /* vt[77] */ virtual void setDrTg(stage_tgsc_class* i_drtg) { mpDrTg = i_drtg; } diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 8eb1a18c3..1a572c599 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -407,7 +407,7 @@ BOOL DynamicModuleControl::do_link() { } } } else { - JUT_ASSERT(724, 0); + JUT_ASSERT(724, FALSE); } OSGetTime(); sAllocBytes = sAllocBytes + getModuleSize(); diff --git a/src/JSystem/JAudio/JASBasicInst.cpp b/src/JSystem/JAudio/JASBasicInst.cpp index b09f7be60..a19afc15b 100644 --- a/src/JSystem/JAudio/JASBasicInst.cpp +++ b/src/JSystem/JAudio/JASBasicInst.cpp @@ -60,7 +60,7 @@ bool JASystem::TBasicInst::getParam(int key, int velo, TInstParam* param) const param->field_0x34 += y; break; default: - JUT_ASSERT(93, 0); + JUT_ASSERT(93, FALSE); } } const TKeymap* keymap = NULL; diff --git a/src/JSystem/JAudio/JASDrumSet.cpp b/src/JSystem/JAudio/JASDrumSet.cpp index 718a9d0aa..21474e3b1 100644 --- a/src/JSystem/JAudio/JASDrumSet.cpp +++ b/src/JSystem/JAudio/JASDrumSet.cpp @@ -55,7 +55,7 @@ bool JASystem::TDrumSet::getParam(int key, int param_2, JASystem::TInstParam* pa param_3->field_0x34 += y; break; default: - JUT_ASSERT(77, 0); + JUT_ASSERT(77, FALSE); break; } } diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 9116d3468..180ad2551 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -209,7 +209,7 @@ BOOL daMbdoor_c::CreateInit() { s32 type = getType(); if (dComIfG_Bgsp()->Regist(mpBgW, this)) { - JUT_ASSERT(334, 0); + JUT_ASSERT(334, FALSE); } field_0x2ac = true; tevStr.mRoomNo = current.roomNo; diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index e22e61a5d..df2129e49 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -72,7 +72,7 @@ BOOL daMtoge_c::CreateInit() { s32 sw = getSwbit(); if (dComIfG_Bgsp()->Regist(mpBgW, this)) { - JUT_PANIC(0xA8); + JUT_ASSERT(0xA8, FALSE); } tevStr.mRoomNo = fopAcM_GetRoomNo(this); diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index 72e2cc311..fd6a1a4d9 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -30,7 +30,7 @@ bool daObjAjavW_c::create_heap() { J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, AJAVW_BTK_AJAVW); if (!pModelData || !pBtk) { - JUT_ASSERT(0xa7, 0); + JUT_ASSERT(0xa7, FALSE); ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 66b414b9d..99ae6f413 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -40,7 +40,7 @@ bool daObjVteng_c::create_heap() { J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, VTENG_BCK_VTENG); if (!pModelData || !pAnm) { - JUT_ASSERT(0xb7, 0); + JUT_ASSERT(0xb7, FALSE); ret = false; } else { mpMorf = new mDoExt_McaMorf( diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 952cd26bc..f4d4c2369 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -43,7 +43,7 @@ bool daObjYgush00_c::create_heap() { J3DAnmTransform * pBck = static_cast(dComIfG_getObjectRes(l_arcname, bck_table[mType])); if (!pModelData || !pBtk || !pBck) { - JUT_ASSERT(207, 0); + JUT_ASSERT(207, FALSE); ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 6753fc3f6..4cb976e41 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -104,7 +104,7 @@ bool daObjBarrier_anm_c::init() { J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YCAGE00)); if (modelData == NULL || pbtk == NULL || pbrk == NULL) { - JUT_PANIC(407); + JUT_ASSERT(407, FALSE); rt = false; } else { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x1000200); @@ -407,7 +407,7 @@ bool daObjBarrier_ef_c::init() { J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); if (modelData == NULL || pbtk == NULL || pbck == NULL || pbrk == NULL) { - JUT_PANIC(1016); + JUT_ASSERT(1016, FALSE); rt = false; } else { for (int i = 0; i < 4; i++) { diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index c20f61763..15996f59e 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -37,7 +37,7 @@ bool daObjGbed_c::create_heap() { J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, GBED_BDL_K_GBED)); if (!pModelData) { - JUT_ASSERT(0xb1, 0); + JUT_ASSERT(0xb1, FALSE); ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index a419784c5..c33297288 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -97,7 +97,7 @@ int daObjGryw00_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00)); J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BCK_GRYW00)); if (!mdlData || !pbtk || !pbck) { - JUT_PANIC(409); + JUT_ASSERT(409, FALSE); ret = FALSE; } else { mpModel = mDoExt_J3DModel__create(mdlData, 0x80000U, 0x11000222U); diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index cf1d1e5c5..b18d1afcf 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -69,7 +69,7 @@ bool daObjHfuck1_c::create_heap() { J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(l_arcname, HFUCK1_BDL_HFUCK1)); if (!pModelData) { - JUT_ASSERT(0xf5, 0); + JUT_ASSERT(0xf5, FALSE); ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022); diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 36172926b..42d8b730e 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -92,7 +92,7 @@ void daPy_lk_c::setParachuteFanModel(f32 f31) { 0x00000000, 0x11020203 ); - if (mpParachuteFanMorf == NULL || mpParachuteFanMorf->getModel() == NULL) { JUT_ASSERT(323, 0); } + if (mpParachuteFanMorf == NULL || mpParachuteFanMorf->getModel() == NULL) { JUT_ASSERT(323, FALSE); } mpEquipItemModel = mpParachuteFanMorf->getModel(); mDoExt_setCurrentHeap(oldHeap); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index a15c25ad3..e1dc0f312 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -3864,7 +3864,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpSwgripmsModel, LINK_BDL_SWGRIPMS, 0x37221222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_SWGRIPMSAB); ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); - if (!ret) { JUT_ASSERT(21046, 0); } + if (!ret) { JUT_ASSERT(21046, FALSE); } mpTswgripmsabBrk = entryBrk(tmp_modelData, LINK_BRK_TSWGRIPMSAB); mpTswgripmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSWGRIPMS); @@ -3873,13 +3873,13 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpShaModel, LINK_BDL_SHA, 0x37221222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_ATNGSHA); ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); - if (!ret) { JUT_ASSERT(21063, 0); } + if (!ret) { JUT_ASSERT(21063, FALSE); } tmp_modelData = initModel(&mpShmsModel, LINK_BDL_SHMS, 0x37221222); mpTshmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSHMS); J3DSkinDeform* shmsSkinDeform = new J3DSkinDeform(); - if (!shmsSkinDeform) { JUT_ASSERT(21077, 0); } - if (mpShmsModel->setSkinDeform(shmsSkinDeform, 1) != J3DErrType_Success ) { JUT_ASSERT(21080, 0); } + if (!shmsSkinDeform) { JUT_ASSERT(21077, FALSE); } + if (mpShmsModel->setSkinDeform(shmsSkinDeform, 1) != J3DErrType_Success ) { JUT_ASSERT(21080, FALSE); } tmp_modelData = initModel(&mpYmsls00Model, LINK_BDL_YMSLS00, 0x13000222); mpYmsls00Btk = entryBtk(tmp_modelData, LINK_BTK_YMSLS00); @@ -3893,7 +3893,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpYuchw00Model, LINK_BDL_YUCHW00, 0x13000222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_YUCHW00); ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); - if (!ret) { JUT_ASSERT(21113, 0); } + if (!ret) { JUT_ASSERT(21113, FALSE); } mpYuchw00Btk = entryBtk(tmp_modelData, LINK_BTK_YUCHW00); mpYuchw00Brk = entryBrk(tmp_modelData, LINK_BRK_YUCHW00); mpYuchw00Brk->setFrame(mpYuchw00Brk->getFrameMax()-0.001f); @@ -3913,14 +3913,14 @@ BOOL daPy_lk_c::createHeap() { mpYaura00Btk = entryBtk(tmp_modelData, LINK_BTK_YAURA00); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R); ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); - if (!ret) { JUT_ASSERT(21147, 0); } + if (!ret) { JUT_ASSERT(21147, FALSE); } mYaura00rBrk.entryFrame(0.0f); tmp_modelData = initModel(&mpYmgcs00Model, LINK_BDL_YMGCS00, 0x11001222); mpYmgcs00Btk = entryBtk(tmp_modelData, LINK_BTK_YMGCS00); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_MS); ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); - if (!ret) { JUT_ASSERT(21161, 0); } + if (!ret) { JUT_ASSERT(21161, FALSE); } mYmgcs00Brk.entryFrame(0.0f); tmp_modelData = static_cast(dComIfG_getObjectRes(l_arcName, LINK_BDL_BOMB)); @@ -4031,7 +4031,7 @@ J3DAnmTevRegKey* daPy_lk_c::entryBrk(J3DModelData*, int) { /* 80124C98-80125CC8 .text playerInit__9daPy_lk_cFv */ void daPy_lk_c::playerInit() { if (!fopAcM_entrySolidHeap(this, daPy_createHeap, 0xB0000)) { - JUT_ASSERT(0x53B6, 0); + JUT_ASSERT(0x53B6, FALSE); } fopAcM_SetMtx(this, mpCLModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 527e7cdb6..d83af017f 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -60,7 +60,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) { const sword_model_tbl_s& model_tbl = checkNormalSwordEquip() ? sword_model_tbl[0] : sword_model_tbl[1]; J3DModelData* modelData = initModel(&mpEquipItemModel, model_tbl.bladeModel, 0x37221222); BOOL ret = mSwordAnim.init(modelData, bck, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); - if (!ret) { JUT_ASSERT(86, 0); } + if (!ret) { JUT_ASSERT(86, FALSE); } if (!checkNormalSwordEquip()) { buffer = new(0x20) u8[0x400]; diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index bf2154727..631e3a035 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -247,7 +247,7 @@ BOOL daTag_Island_c::demoProcTact_Af() { setFlag(0x02); fopAcM_orderChangeEventId(this, daPy_getPlayerLinkActorClass(), mEventId, 0, 0xFFFF); } else { - JUT_ASSERT(0x1b3, 0); + JUT_ASSERT(0x1b3, FALSE); dComIfGp_evmng_cutEnd(mStaffId); } } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 91ac7a8f1..ecf784bcb 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -528,7 +528,7 @@ void daTbox_c::CreateInit() { mpAppearRegAnm->setFrame(30.0f); break; default: - JUT_ASSERT(0x328, 0); + JUT_ASSERT(0x328, FALSE); break; } diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index b6bbcfc3d..e1241756a 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -41,7 +41,7 @@ s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 hindFlag, v pNewOrder->mEventInfoIdx = eventInfoIdx; if (pNewOrder->mPriority == 0) - JUT_ASSERT(0x93, 0); + JUT_ASSERT(0x93, FALSE); if (mOrderCount == 0) { mFirstOrderIdx = 0; @@ -143,7 +143,7 @@ BOOL dEvt_control_c::talkCheck(dEvt_order_c* order) { } if (!dComIfGp_evmng_order(mEventId)) - JUT_ASSERT(0x145, 0); + JUT_ASSERT(0x145, FALSE); return TRUE; } else { @@ -203,7 +203,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) { } if (!dComIfGp_evmng_order(mEventId)) { - JUT_ASSERT(401, 0); + JUT_ASSERT(401, FALSE); } return TRUE; } @@ -231,7 +231,7 @@ BOOL dEvt_control_c::photoCheck(dEvt_order_c* order) { } if (!dComIfGp_evmng_order(mEventId)) - JUT_ASSERT(0x1b5, 0); + JUT_ASSERT(0x1b5, FALSE); mbInPhoto = 1; mMode = dEvtMode_TALK_e; @@ -258,7 +258,7 @@ BOOL dEvt_control_c::catchCheck(dEvt_order_c* order) { mItemNo = dComIfGp_att_getCatchChgItem(); mMode = dEvtMode_DEMO_e; if (mEventId != -1 && !dComIfGp_evmng_order(mEventId)) - JUT_ASSERT(0x1e3, 0); + JUT_ASSERT(0x1e3, FALSE); onEventFlag(0x80); return TRUE; } @@ -288,7 +288,7 @@ BOOL dEvt_control_c::demoCheck(dEvt_order_c* order) { s16 eventId = order->mEventId; if (actor2 == NULL) { - JUT_ASSERT(0x21f, 0); + JUT_ASSERT(0x21f, FALSE); return FALSE; } @@ -336,7 +336,7 @@ BOOL dEvt_control_c::potentialCheck(dEvt_order_c* order) { fopAc_ac_c* actor1 = order->mActor1; fopAc_ac_c* actor2 = order->mActor2; if (actor1 == NULL || actor2 == NULL) - JUT_ASSERT(0x280, 0); + JUT_ASSERT(0x280, FALSE); if (!beforeFlagProc(order)) return FALSE; @@ -357,7 +357,7 @@ BOOL dEvt_control_c::doorCheck(dEvt_order_c* order) { mEventId = actor2->eventInfo.getEventId(); if (mEventId != -1 && dComIfGp_getPEvtManager()->getEventData(mEventId) != NULL) { if (!dComIfGp_evmng_order(mEventId)) - JUT_ASSERT(0x2c0, 0); + JUT_ASSERT(0x2c0, FALSE); } else { mEventId = -1; reset(); @@ -379,7 +379,7 @@ BOOL dEvt_control_c::itemCheck(dEvt_order_c* order) { mMode = dEvtMode_DEMO_e; mEventId = dComIfGp_evmng_getEventIdx(defaultEventName); if (!dComIfGp_evmng_order(mEventId)) - JUT_ASSERT(0x2ea, 0); + JUT_ASSERT(0x2ea, FALSE); return TRUE; } else { return FALSE; @@ -398,7 +398,7 @@ BOOL dEvt_control_c::endProc() { case dEvtMode_COMPULSORY_e: break; default: - JUT_ASSERT(0x315, 0); + JUT_ASSERT(0x315, FALSE); } mMode = dEvtMode_NONE_e; @@ -506,7 +506,7 @@ BOOL dEvt_control_c::checkStart() { case dEvtType_CHANGE_e: break; default: - JUT_ASSERT(0x39c, 0); + JUT_ASSERT(0x39c, FALSE); break; } diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index d81d9d624..765b2138a 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -52,7 +52,7 @@ BOOL dEvDt_Next_Stage(int staffIdx, int wipePrm) { dKy_set_nexttime(*pHour * 15.0f); dComIfGp_setNextStage(pStageName, *pStartCode, roomNo, layerNo, 0.0f, mode, TRUE, wipe); } else { - JUT_ASSERT(0x88, 0); + JUT_ASSERT(0x88, FALSE); } return TRUE; @@ -204,7 +204,7 @@ void dEvDtStaff_c::advanceCut(int cutIdx) { void dEvDtStaff_c::specialProcLight() { int staffIdx = dComIfGp_evmng_getMyStaffId("LIGHT"); if (staffIdx == -1) { - JUT_ASSERT(0x16a, 0); + JUT_ASSERT(0x16a, FALSE); return; } @@ -255,7 +255,7 @@ void dEvDtStaff_c::specialProcLight() { void dEvDtStaff_c::specialProcMessage() { int staffIdx = dComIfGp_evmng_getMyStaffId("MESSAGE"); if (staffIdx == -1) { - JUT_ASSERT(0x1C2, 0); + JUT_ASSERT(0x1C2, FALSE); return; } @@ -380,7 +380,7 @@ void dEvDtStaff_c::specialProcMessage() { void dEvDtStaff_c::specialProcSound() { int staffIdx = dComIfGp_evmng_getMyStaffId("SOUND"); if (staffIdx == -1) { - JUT_ASSERT(0x254, 0); + JUT_ASSERT(0x254, FALSE); return; } @@ -424,7 +424,7 @@ void dEvDtStaff_c::specialProcSound() { 2, 3, 4, 5, 6, 1, 7, }; if (*pPrepare > 6) - JUT_ASSERT(0x293, 0); + JUT_ASSERT(0x293, FALSE); mDoAud_prepareLandingDemo(landing_table[*pPrepare]); } @@ -465,7 +465,7 @@ void dEvDtStaff_c::specialProcSound() { void dEvDtStaff_c::specialProcCreate() { int staffIdx = dComIfGp_evmng_getMyStaffId("CREATER"); if (staffIdx == -1) { - JUT_ASSERT(0x2d3, 0); + JUT_ASSERT(0x2d3, FALSE); return; } @@ -536,7 +536,7 @@ void dEvDtStaff_c::specialProcDirector() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getLinkPlayer(); int staffIdx = dComIfGp_evmng_getMyStaffId("DIRECTOR"); if (staffIdx == -1) { - JUT_ASSERT(0x330, 0); + JUT_ASSERT(0x330, FALSE); return; } @@ -605,12 +605,12 @@ void dEvDtStaff_c::specialProcDirector() { { specialProc_WaitStart(staffIdx); if (mTimer == 0) - JUT_ASSERT(0x36b, 0); + JUT_ASSERT(0x36b, FALSE); const u8* pattern = (const u8*)dComIfGp_evmng_getMyIntegerP(staffIdx, "Pattern"); const u32* type = dComIfGp_evmng_getMyIntegerP(staffIdx, "Type"); if (pattern == NULL || type == NULL) - JUT_ASSERT(0x36f, 0); + JUT_ASSERT(0x36f, FALSE); Vec xyz; xyz.x = 0.0f; @@ -711,7 +711,7 @@ void dEvDtStaff_c::specialProcDirector() { void dEvDtStaff_c::specialProcPackage() { int staffIdx = dComIfGp_evmng_getMyStaffId("PACKAGE"); if (staffIdx == -1) { - JUT_ASSERT(0x3f2, 0); + JUT_ASSERT(0x3f2, FALSE); return; } @@ -779,7 +779,7 @@ void dEvDtStaff_c::specialProcPackage() { } break; case -1: - JUT_ASSERT(0x45c, 0); + JUT_ASSERT(0x45c, FALSE); dComIfGp_evmng_cutEnd(staffIdx); break; } @@ -789,7 +789,7 @@ void dEvDtStaff_c::specialProcPackage() { void dEvDtStaff_c::specialProcTimekeeper() { int staffIdx = dComIfGp_evmng_getMyStaffId("TIMEKEEPER"); if (staffIdx == -1) { - JUT_ASSERT(0x471, 0); + JUT_ASSERT(0x471, FALSE); return; } @@ -826,7 +826,7 @@ void dEvDtStaff_c::specialProcTimekeeper() { dComIfGp_evmng_cutEnd(staffIdx); break; case -1: - JUT_ASSERT(0x49f, 0); + JUT_ASSERT(0x49f, FALSE); dComIfGp_evmng_cutEnd(staffIdx); break; } diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index f069a93f7..2d3ed69ac 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -101,12 +101,12 @@ enum { /* 80073A4C-80073BC0 .text getSubstance__16dEvent_manager_cFP11dEvDtData_ci */ void* dEvent_manager_c::getSubstance(dEvDtData_c* data, int type) { if (data->getIndex() < 0 || data->getNumber() <= 0) { - JUT_ASSERT(0x169, 0); + JUT_ASSERT(0x169, FALSE); return NULL; } if (type != -1 && type != data->getType()) { - JUT_ASSERT(0x16e, 0); + JUT_ASSERT(0x16e, FALSE); } s32 index; @@ -123,7 +123,7 @@ void* dEvent_manager_c::getSubstance(dEvDtData_c* data, int type) { index = data->getIndex(); return mList.getSDataP(index); default: - JUT_ASSERT(0x182, 0); + JUT_ASSERT(0x182, FALSE); return NULL; } } @@ -269,7 +269,7 @@ void dEvent_manager_c::closeProc(dEvDtEvent_c* event) { void dEvent_manager_c::endProc(s16 eventIdx, int act) { dEvDtEvent_c* event = getEventData(eventIdx); if (event == NULL) { - JUT_ASSERT(0x2ec, 0); + JUT_ASSERT(0x2ec, FALSE); return; } @@ -430,7 +430,7 @@ int dEvmng_strcmp(const char* s1, char* s2) { u32 len2 = strlen(s2); if (len1 >= 100 || len2 >= 100) { - JUT_ASSERT(0x44a, 0); + JUT_ASSERT(0x44a, FALSE); return -1; } @@ -657,7 +657,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 profName, int flag) { param.actor = dComIfGp_getPlayer(0); if (dComIfGp_getPlayer(0) == NULL) - JUT_ASSERT(0x623, 0); + JUT_ASSERT(0x623, FALSE); fopAc_ac_c* shutter = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)findShutterCallBack, ¶m); if (shutter != NULL && flag) { @@ -824,7 +824,7 @@ static u8 daNpc_Tt_tact_table[] = { /* 800754EC-80075590 .text dEvmng_daNpc_Tt_Conv__FUc */ u8 dEvmng_daNpc_Tt_Conv(u8 param_0) { if (param_0 >= ARRAY_SIZE(daNpc_Tt_tact_table)) { - JUT_ASSERT(1814, 0); + JUT_ASSERT(1814, FALSE); } for (u8 i = 0; i < ARRAY_SIZE(daNpc_Tt_tact_table); i++) { if (daNpc_Tt_tact_table[i] == param_0) { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 7d68625f4..69d4e5cf2 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -405,7 +405,7 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_this, heapCallbackFunc createHeapCB, u3 } OSReport_Error("ばぐばぐです\n"); - JUT_ASSERT(0x4b5, 0); + JUT_ASSERT(0x4b5, FALSE); } OSReport_Error("fopAcM_entrySolidHeap だめでした [%s]\n", pProcNameString); diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 5946f3a3a..c855ab7dd 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -1170,7 +1170,7 @@ void fopMsgM_setPaneData(fopMsgM_pane_alpha_class* i_this, J2DScreen* scrn, u32 i_this->pane = pane; fopMsgM_pane_parts_set(i_this); } else { - JUT_ASSERT(0x398d, 0); + JUT_ASSERT(0x398d, FALSE); } } diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index 0e4cb52fd..0bb80c04b 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -46,7 +46,7 @@ u32 fopScnM_ReRequest(s16 param_1, u32 param_2) { void fopScnM_Management() { if (!fopScnRq_Handler()) - JUT_ASSERT(326, 0); + JUT_ASSERT(326, FALSE); } void fopScnM_Init() { diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index 0b5faeaeb..4de48c51a 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -68,7 +68,7 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) { layer_class* layer = &procNode->mLayer; if (!fpcLy_Cancel(layer)) - JUT_ASSERT(196, 0); + JUT_ASSERT(196, FALSE); if (fpcLyIt_OnlyHereLY(layer, (fpcLyIt_OnlyHereFunc)fpcDt_ToDeleteQ, NULL) == 0) { return 0;