diff options
| author | DanTGL <33489389+DanTGL@users.noreply.github.com> | 2024-07-06 15:38:13 +0200 |
|---|---|---|
| committer | DanTGL <33489389+DanTGL@users.noreply.github.com> | 2024-07-06 15:38:13 +0200 |
| commit | d2212904ba1c8d71d6330164890efb53e3cec0fd (patch) | |
| tree | d506f3d53f2b6400d8028ca71db807e7b4ed84ef /src | |
| parent | 44e2c2695a8026a3dfc76b4a593cd5d6576f4382 (diff) | |
Modified return types
Diffstat (limited to 'src')
| -rw-r--r-- | src/d/actor/d_a_bflower.cpp | 8 | ||||
| -rw-r--r-- | src/d/actor/d_a_deku_item.cpp | 12 | ||||
| -rw-r--r-- | src/d/actor/d_a_lbridge.cpp | 8 | ||||
| -rw-r--r-- | src/d/actor/d_a_pedestal.cpp | 12 | ||||
| -rw-r--r-- | src/d/actor/d_a_windmill.cpp | 6 |
5 files changed, 23 insertions, 23 deletions
diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index e1df48df..0a865625 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -270,7 +270,7 @@ static daBFlower_c::ActionFunc action_tbl[] = { }; /* 00000F4C-00001078 .text _execute__11daBFlower_cFv */ -BOOL daBFlower_c::_execute() { +bool daBFlower_c::_execute() { daPy_py_c* player = daPy_getPlayerActorClass(); (this->*action_tbl[mState])(); @@ -465,7 +465,7 @@ void daBFlower_c::setCollision() { } /* 000019AC-00001AC4 .text _draw__11daBFlower_cFv */ -BOOL daBFlower_c::_draw() { +bool daBFlower_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); @@ -505,12 +505,12 @@ static BOOL daBFlower_Delete(void* i_this) { /* 00001B14-00001B38 .text daBFlower_Draw__FPv */ static BOOL daBFlower_Draw(void* i_this) { - return (u8)static_cast<daBFlower_c*>(i_this)->_draw(); + return static_cast<daBFlower_c*>(i_this)->_draw(); } /* 00001B38-00001B5C .text daBFlower_Execute__FPv */ static BOOL daBFlower_Execute(void* i_this) { - return (u8)static_cast<daBFlower_c*>(i_this)->_execute(); + return static_cast<daBFlower_c*>(i_this)->_execute(); } /* 00001B5C-00001B64 .text daBFlower_IsDelete__FPv */ diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index fdbc5966..929551f1 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -46,7 +46,7 @@ static dCcD_SrcCyl l_cyl_src = { }}; /* 00000078-000000D0 .text _delete__12daDekuItem_cFv */ -BOOL daDekuItem_c::_delete() { +bool daDekuItem_c::_delete() { if (mpEmitter != NULL) { mpEmitter->becomeInvalidEmitter(); mpEmitter = NULL; @@ -145,7 +145,7 @@ void daDekuItem_c::set_mtx() { } /* 000009C8-00000A74 .text _execute__12daDekuItem_cFv */ -BOOL daDekuItem_c::_execute() { +bool daDekuItem_c::_execute() { eyePos = current.pos; fopAcM_posMoveF(this, mStts.GetCCMoveP()); mAcch.CrrPos(*dComIfG_Bgsp()); @@ -242,7 +242,7 @@ void daDekuItem_c::checkOrder() { } /* 00000E54-00000ECC .text _draw__12daDekuItem_cFv */ -BOOL daDekuItem_c::_draw() { +bool daDekuItem_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); @@ -259,17 +259,17 @@ static s32 daDekuItem_Create(void* i_this) { /* 00000EEC-00000F10 .text daDekuItem_Delete__FPv */ static BOOL daDekuItem_Delete(void* i_this) { - return (u8) static_cast<daDekuItem_c*>(i_this)->_delete(); + return static_cast<daDekuItem_c*>(i_this)->_delete(); } /* 00000F10-00000F34 .text daDekuItem_Draw__FPv */ static BOOL daDekuItem_Draw(void* i_this) { - return (u8) static_cast<daDekuItem_c*>(i_this)->_draw(); + return static_cast<daDekuItem_c*>(i_this)->_draw(); } /* 00000F34-00000F58 .text daDekuItem_Execute__FPv */ static BOOL daDekuItem_Execute(void* i_this) { - return (u8) static_cast<daDekuItem_c*>(i_this)->_execute(); + return static_cast<daDekuItem_c*>(i_this)->_execute(); } /* 00000F58-00000F60 .text daDekuItem_IsDelete__FPv */ diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index 5010f4cc..5105e5d9 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -127,7 +127,7 @@ void daLbridge_c::setMoveBGMtx() { } /* 00000888-00000914 .text _execute__11daLbridge_cFv */ -BOOL daLbridge_c::_execute() { +bool daLbridge_c::_execute() { bool isSw = fopAcM_isSwitch(this, mSwitchNo); sw_check(); @@ -270,7 +270,7 @@ void daLbridge_c::set_off_se() { } /* 00000F10-00000FF8 .text _draw__11daLbridge_cFv */ -BOOL daLbridge_c::_draw() { +bool daLbridge_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); @@ -314,12 +314,12 @@ static BOOL daLbridge_Delete(void* i_this) { /* 000010D4-000010F8 .text daLbridge_Draw__FPv */ static BOOL daLbridge_Draw(void* i_this) { - return (u8) static_cast<daLbridge_c*>(i_this)->_draw(); + return static_cast<daLbridge_c*>(i_this)->_draw(); } /* 000010F8-0000111C .text daLbridge_Execute__FPv */ static BOOL daLbridge_Execute(void* i_this) { - return (u8) static_cast<daLbridge_c*>(i_this)->_execute(); + return static_cast<daLbridge_c*>(i_this)->_execute(); } /* 0000111C-00001124 .text daLbridge_IsDelete__FPv */ diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 84db0072..6038ba58 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -18,7 +18,7 @@ namespace daPedestal { const char daPds_c::m_arcname[] = "Hdai1"; /* 00000078-000000DC .text _delete__Q210daPedestal7daPds_cFv */ -BOOL daPds_c::_delete() { +bool daPds_c::_delete() { if (heap != NULL) { dComIfG_Bgsp()->Release(mpBgW); } @@ -370,7 +370,7 @@ void daPds_c::playBrkAnm() { } /* 00000D98-00000E48 .text _execute__Q210daPedestal7daPds_cFv */ -BOOL daPds_c::_execute() { +bool daPds_c::_execute() { playBrkAnm(); if (!eventProc()) { @@ -388,7 +388,7 @@ BOOL daPds_c::_execute() { } /* 00000E48-00000F10 .text _draw__Q210daPedestal7daPds_cFv */ -BOOL daPds_c::_draw() { +bool daPds_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); @@ -412,17 +412,17 @@ static s32 daPds_Create(void* i_this) { /* 00000F30-00000F54 .text daPds_Delete__10daPedestalFPv */ static BOOL daPds_Delete(void* i_this) { - return (u8) static_cast<daPds_c*>(i_this)->_delete(); + return static_cast<daPds_c*>(i_this)->_delete(); } /* 00000F54-00000F78 .text daPds_Draw__10daPedestalFPv */ static BOOL daPds_Draw(void* i_this) { - return (u8) static_cast<daPds_c*>(i_this)->_draw(); + return static_cast<daPds_c*>(i_this)->_draw(); } /* 00000F78-00000F9C .text daPds_Execute__10daPedestalFPv */ static BOOL daPds_Execute(void* i_this) { - return (u8) static_cast<daPds_c*>(i_this)->_execute(); + return static_cast<daPds_c*>(i_this)->_execute(); } /* 00000F9C-00000FA4 .text daPds_IsDelete__10daPedestalFPv */ diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index 44117845..0e1cb404 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -11,7 +11,7 @@ const char* daWindMill_c::m_arcname[] = { "Hpu1", "Hpu2" }; /* 00000078-000000E8 .text _delete__12daWindMill_cFv */ -BOOL daWindMill_c::_delete() { +bool daWindMill_c::_delete() { if (heap != NULL && mpBgW != NULL) dComIfG_Bgsp()->Release(mpBgW); dComIfG_resDelete(&mPhs, m_arcname[mType]); @@ -58,7 +58,7 @@ void daWindMill_c::set_mtx() { } /* 00000E4C-00000ECC .text _execute__12daWindMill_cFv */ -BOOL daWindMill_c::_execute() { +bool daWindMill_c::_execute() { /* Nonmatching */ } @@ -78,7 +78,7 @@ void daWindMill_c::set_co() { } /* 000016DC-000017A4 .text _draw__12daWindMill_cFv */ -BOOL daWindMill_c::_draw() { +bool daWindMill_c::_draw() { /* Nonmatching */ } |
