Game-Decompilation/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2024-11-27 07:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #664 from DanTGL/main

Browse Source 
Modified return types
This commit is contained in:
LagoLunatic 2024-07-06 09:44:33 -04:00 committed by GitHub
commit 67e3fbd895
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/d/actor/d_a_bflower.h
View File

@ -23,12 +23,12 @@ public:
int init_bck_anm(s16 param);
s32 _create();
void set_mtx();
BOOL _execute();
bool _execute();
BOOL actLive();
BOOL actDead();
void animPlay();
void setCollision();
BOOL _draw();
bool _draw();
static const char m_arcname[];

6
include/d/actor/d_a_deku_item.h
View File

@ -18,12 +18,12 @@ public:
Mode_GETDEMO_e,
};
BOOL _delete();
bool _delete();
BOOL CreateHeap();
void CreateInit();
s32 _create();
void set_mtx();
BOOL _execute();
bool _execute();
void mode_proc_call();
void mode_wait();
void mode_getdemo_init();
@ -31,7 +31,7 @@ public:
void mode_getdemo();
void eventOrder();
void checkOrder();
BOOL _draw();
bool _draw();
static const char m_arcname[];

4
include/d/actor/d_a_lbridge.h
View File

@ -13,14 +13,14 @@ public:
s32 _create();
void set_mtx();
void setMoveBGMtx();
BOOL _execute();
bool _execute();
void sw_check();
void demo();
void appear_bridge();
void disappear_bridge();
void set_on_se();
void set_off_se();
BOOL _draw();
bool _draw();
static const char m_arcname[];

6
include/d/actor/d_a_pedestal.h
View File

@ -39,7 +39,7 @@ namespace daPedestal {
typedef int (daPds_c::* ActionFunc_t)(void*);
BOOL _delete();
bool _delete();
BOOL CreateHeap();
void CreateInit();
s32 _create();
@ -59,8 +59,8 @@ namespace daPedestal {
void set_mtx();
BOOL initBrkAnm(u8, bool);
void playBrkAnm();
BOOL _execute();
BOOL _draw();
bool _execute();
bool _draw();
static const char m_arcname[];

6
include/d/actor/d_a_windmill.h
View File

@ -13,17 +13,17 @@ public:
void getRotSpeed() const {}
void getType() const {}
BOOL _delete();
bool _delete();
BOOL CreateHeap();
void CreateInit();
void search_wind();
s32 _create();
void set_mtx();
BOOL _execute();
bool _execute();
void hane_move();
void set_at();
void set_co();
BOOL _draw();
bool _draw();
static const s16 m_max_rot_speed[];
static const char* m_arcname[];

8
src/d/actor/d_a_bflower.cpp
View File

@ -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, &current.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 */

12
src/d/actor/d_a_deku_item.cpp
View File

@ -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, &current.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 */

8
src/d/actor/d_a_lbridge.cpp
View File

@ -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, &current.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 */

12
src/d/actor/d_a_pedestal.cpp
View File

@ -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, &current.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 */

6
src/d/actor/d_a_windmill.cpp
View File

@ -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 */
}