From b9490ec0820bb7dd33215899e550709ec167b609 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 26 Nov 2023 14:37:07 -0500 Subject: [PATCH] fix wrong return types caused by bad regex --- include/d/actor/d_a_boomerang.h | 41 ++++++++++++++++++++++++++++--- include/d/actor/d_a_hookshot.h | 2 +- include/d/actor/d_a_obj_barrier.h | 6 ++--- src/d/actor/d_a_boomerang.cpp | 37 +++------------------------- src/d/actor/d_a_bwdg.cpp | 2 +- src/d/actor/d_a_goal_flag.cpp | 2 +- src/d/actor/d_a_grid.cpp | 2 +- src/d/actor/d_a_hookshot.cpp | 2 +- src/d/actor/d_a_majuu_flag.cpp | 2 +- src/d/actor/d_a_mant.cpp | 2 +- src/d/actor/d_a_obj_barrier.cpp | 6 ++--- src/d/actor/d_a_obj_buoyflag.cpp | 2 +- src/d/actor/d_a_obj_tapestry.cpp | 2 +- src/d/actor/d_a_pirate_flag.cpp | 2 +- src/d/actor/d_a_sail.cpp | 2 +- 15 files changed, 59 insertions(+), 53 deletions(-) diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index 33c0475b5..49153df8d 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -2,15 +2,50 @@ #define D_A_BOOMERANG_H #include "f_op/f_op_actor.h" +#include "d/d_cc_d.h" -class daBoomerang_blur_c : public fopAc_ac_c { +class daBoomerang_c : public fopAc_ac_c { public: - void initBlur(float(*)[4], short); - void copyBlur(float(*)[4], short); + void onCancelFlg() {} + + daBoomerang_c(); + s32 create(); BOOL draw(); + BOOL execute(); + void getFlyMax(); + void rockLineCallback(fopAc_ac_c*); + void setAimActor(fopAc_ac_c*); + void setLockActor(fopAc_ac_c*, int); + void resetLockActor(); + void setRoomInfo(); + void setKeepMatrix(); + void setAimPos(); + void checkBgHit(cXyz*, cXyz*); + void procWait(); + void procMove(); + void createHeap(); public: /* Place member variables here */ }; +class daBoomerang_blur_c { +public: + void initBlur(MtxP, s16); + void copyBlur(MtxP, s16); + void draw(); +}; + +class daBoomerang_sightPacket_c { +public: + void draw(); + void setSight(cXyz*, int); + void play(int); +}; + +class dBgS_BoomerangLinChk { +public: + ~dBgS_BoomerangLinChk(); +}; + #endif /* D_A_BOOMERANG_H */ diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h index 5803bfa9d..d4c8ace7b 100644 --- a/include/d/actor/d_a_hookshot.h +++ b/include/d/actor/d_a_hookshot.h @@ -9,7 +9,7 @@ class daHookshot_shape : public J3DPacket { public: - BOOL draw(); + void draw(); daHookshot_shape() {} ~daHookshot_shape() {} }; diff --git a/include/d/actor/d_a_obj_barrier.h b/include/d/actor/d_a_obj_barrier.h index 79f8a1da7..b06aa474b 100644 --- a/include/d/actor/d_a_obj_barrier.h +++ b/include/d/actor/d_a_obj_barrier.h @@ -32,9 +32,9 @@ public: bool checkHitActor(fopAc_ac_c*); void birth(fopAc_ac_c*, f32, cXyz, cXyz, int); bool init(); - s32 create(); - BOOL execute(); - BOOL draw(); + void create(); + void execute(); + void draw(); f32 getBtkFrame(int i_idx) { return mBtk[i_idx].getFrame(); } diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 62d4f1d40..912bb9c81 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -7,22 +7,22 @@ #include "dolphin/types.h" /* 800E0C08-800E0D44 .text initBlur__18daBoomerang_blur_cFPA4_fs */ -void daBoomerang_blur_c::initBlur(float(*)[4], short) { +void daBoomerang_blur_c::initBlur(MtxP, s16) { /* Nonmatching */ } /* 800E0D44-800E101C .text copyBlur__18daBoomerang_blur_cFPA4_fs */ -void daBoomerang_blur_c::copyBlur(float(*)[4], short) { +void daBoomerang_blur_c::copyBlur(MtxP, s16) { /* Nonmatching */ } /* 800E101C-800E13A4 .text draw__18daBoomerang_blur_cFv */ -BOOL daBoomerang_blur_c::draw() { +void daBoomerang_blur_c::draw() { /* Nonmatching */ } /* 800E13A4-800E14F0 .text draw__25daBoomerang_sightPacket_cFv */ -BOOL daBoomerang_sightPacket_c::draw() { +void daBoomerang_sightPacket_c::draw() { /* Nonmatching */ } @@ -155,32 +155,3 @@ dBgS_BoomerangLinChk::~dBgS_BoomerangLinChk() { void daBoomerang_Create(fopAc_ac_c*) { /* Nonmatching */ } - - - - -/* 800E34AC-800E34C8 .text getBoomerangCatchPos__9daPy_lk_cCFv */ -void daPy_lk_c::getBoomerangCatchPos() const { - /* Nonmatching */ -} - -/* 800E34C8-800E34F4 .text getLineTopPos__9daPy_lk_cFv */ -void daPy_lk_c::getLineTopPos() { - /* Nonmatching */ -} - -/* 800E34F4-800E3510 .text getPos__18daPy_sightPacket_cFv */ -void daPy_sightPacket_c::getPos() { - /* Nonmatching */ -} - -/* 800E3510-800E35DC .text __dt__18daBoomerang_blur_cFv */ -daBoomerang_blur_c::~daBoomerang_blur_c() { - /* Nonmatching */ -} - -/* 800E35DC-800E3638 .text __dt__25daBoomerang_sightPacket_cFv */ -daBoomerang_sightPacket_c::~daBoomerang_sightPacket_c() { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index e551d4933..2a5cc7670 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -7,7 +7,7 @@ #include "dolphin/types.h" /* 00000078-000001C4 .text draw__15daBwdg_packet_cFv */ -BOOL daBwdg_packet_c::draw() { +void daBwdg_packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index 5919bd3d9..0c6fd1adc 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -17,7 +17,7 @@ void daGFlag_packet_c::setToonTexObj() { } /* 00000330-00000978 .text draw__16daGFlag_packet_cFv */ -BOOL daGFlag_packet_c::draw() { +void daGFlag_packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp index 1c9d61d76..84c6c7c44 100644 --- a/src/d/actor/d_a_grid.cpp +++ b/src/d/actor/d_a_grid.cpp @@ -27,7 +27,7 @@ void daHo_packet_c::setTopNrmVtx(cXyz*) { } /* 800E93B8-800E9BE8 .text draw__13daHo_packet_cFv */ -BOOL daHo_packet_c::draw() { +void daHo_packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 40cc93e52..8fe9e8e9b 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -127,7 +127,7 @@ static u8 l_matDL[] __attribute__((aligned(32))) = { }; /* 800F104C-800F12C8 .text draw__16daHookshot_shapeFv */ -BOOL daHookshot_shape::draw() { +void daHookshot_shape::draw() { daHookshot_c* hookshot = reinterpret_cast(mpUserData); int chain_count = hookshot->getChainCnt(); if (chain_count < 1) { diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 6c7a992f4..6eafe0b4b 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -27,7 +27,7 @@ void daMajuu_Flag_packet_c::setNrmVtx(cXyz*, int) { } /* 000006E8-00000D30 .text draw__21daMajuu_Flag_packet_cFv */ -BOOL daMajuu_Flag_packet_c::draw() { +void daMajuu_Flag_packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index ff5cb0e1d..27cab5eef 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -7,7 +7,7 @@ #include "dolphin/types.h" /* 000000EC-000003EC .text draw__15daMant_packet_cFv */ -BOOL daMant_packet_c::draw() { +void daMant_packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index c78b4f932..e6ec3b50a 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -433,14 +433,14 @@ bool daObjBarrier_ef_c::init() { } /* 000013E0-00001420 .text create__17daObjBarrier_ef_cFv */ -s32 daObjBarrier_ef_c::create() { +void daObjBarrier_ef_c::create() { for (int i = 0; i < 4; i++) { mpModel[i]->setBaseScale(l_ef_scale); } } /* 00001420-000014E0 .text execute__17daObjBarrier_ef_cFv */ -BOOL daObjBarrier_ef_c::execute() { +void daObjBarrier_ef_c::execute() { int active_flags = mActiveEffFlags; for (int i = 0; i < 4; i++) { if (((active_flags >> i) & 1)) { @@ -457,7 +457,7 @@ BOOL daObjBarrier_ef_c::execute() { } /* 000014E0-00001638 .text draw__17daObjBarrier_ef_cFv */ -BOOL daObjBarrier_ef_c::draw() { +void daObjBarrier_ef_c::draw() { J3DModel* model_p; int active_flags = mActiveEffFlags; diff --git a/src/d/actor/d_a_obj_buoyflag.cpp b/src/d/actor/d_a_obj_buoyflag.cpp index 0752b5baa..f58b59383 100644 --- a/src/d/actor/d_a_obj_buoyflag.cpp +++ b/src/d/actor/d_a_obj_buoyflag.cpp @@ -22,7 +22,7 @@ void daObjBuoyflag::Packet_c::draw_hasi(daObjBuoyflag::Act_c*) { } /* 00000C4C-00000CB8 .text draw__Q213daObjBuoyflag8Packet_cFv */ -BOOL daObjBuoyflag::Packet_c::draw() { +void daObjBuoyflag::Packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp index 79e6c13c7..346e9bed2 100644 --- a/src/d/actor/d_a_obj_tapestry.cpp +++ b/src/d/actor/d_a_obj_tapestry.cpp @@ -217,7 +217,7 @@ void daObjTapestryPacket_c::setup_tevColReg(daObjTapestry_c*) { } /* 000044B8-000045C8 .text draw__21daObjTapestryPacket_cFv */ -BOOL daObjTapestryPacket_c::draw() { +void daObjTapestryPacket_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index c980876bd..26bfa40fd 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -22,7 +22,7 @@ void daPirate_Flag_packet_c::setNrmVtx(cXyz*, int, int) { } /* 0000083C-00000E44 .text draw__22daPirate_Flag_packet_cFv */ -BOOL daPirate_Flag_packet_c::draw() { +void daPirate_Flag_packet_c::draw() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index f21d47d3f..b30288126 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -27,7 +27,7 @@ void daSail_packet_c::setNrmVtx(cXyz*, int, int) { } /* 00000870-000010D8 .text draw__15daSail_packet_cFv */ -BOOL daSail_packet_c::draw() { +void daSail_packet_c::draw() { /* Nonmatching */ }