mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 13:24:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing returns and other warnings

Browse Source
This commit is contained in:
LagoLunatic
2026-03-12 17:14:10 -04:00
parent e70562699f
commit e580412bcf
12 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_fm.cpp
+5 -5
View File
@@ -606,11 +606,11 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) {
/* 00000F18-00000F44 .text searchNearFm_CB__FPvPv */
static void* searchNearFm_CB(void* param_1, void* param_2) {
((daFm_c*)param_2)->searchNearFm((fopAc_ac_c*)param_1);
return ((daFm_c*)param_2)->searchNearFm((fopAc_ac_c*)param_1);
}
/* 00000F44-00001150 .text searchNearFm__6daFm_cFP10fopAc_ac_c */
bool daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
void* daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
f32 dist;
if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FM) { // redundant isactor check?
f32 abs = (field_0x3E4 - current.pos).absXZ();
@@ -623,7 +623,7 @@ bool daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
}
}
}
return false;
return NULL;
}
/* 00001150-00001384 .text moveRndBack__6daFm_cFv */
@@ -2746,7 +2746,7 @@ void daFm_c::grabPlayer() {
csXyz angle(0, 0, 0);
switch (mAnmPrmIdx) {
case 4:
case 6:
case 6: {
daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
cXyz offset2 = pLink->getHeadTopPos() - pLink->current.pos;
temp.set(5.0f, 0.0f, 10.0f);
@@ -2759,7 +2759,7 @@ void daFm_c::grabPlayer() {
mDoMtx_stack_c::transM(temp2);
MTXCopy(mDoMtx_stack_c::get(), field_0x6BC);
pLink->setPlayerPosAndAngle(mDoMtx_stack_c::get());
}
case 5:
default:
break;
src/d/actor/d_a_himo3.cpp
+5
View File
@@ -295,7 +295,12 @@ static BOOL daHimo3_Draw(himo3_class* i_this) {
fVar1 = DEMO_SELECT(REG0_F(0) + 3.75f, 3.75f);
}
#ifdef __MWERKS__
i_this->mLineMat.update(i_this->m15C0, fVar1, (GXColor){200, 150, 50, 255}, 0, &i_this->tevStr);
#else
GXColor color = (GXColor){200, 150, 50, 255};
i_this->mLineMat.update(i_this->m15C0, fVar1, color, 0, &i_this->tevStr);
#endif
dComIfGd_set3DlineMat(&i_this->mLineMat);
if (i_this->m0298 != 0xf) {
src/d/actor/d_a_npc_zl1.cpp
+4 -4
View File
@@ -946,7 +946,7 @@ void daNpc_Zl1_c::setAnm_ATR() {
/* 00001E18-00001ED4 .text anmAtr__11daNpc_Zl1_cFUs */
void daNpc_Zl1_c::anmAtr(u16 mesgNo) {
switch(mesgNo) {
case 6:
case 6: {
if(field_0x851 == 0) {
chngAnmAtr(dComIfGp_getMesgAnimeAttrInfo());
field_0x851++;
@@ -958,6 +958,7 @@ void daNpc_Zl1_c::anmAtr(u16 mesgNo) {
chngAnmTag();
}
break;
}
case 0xe:
field_0x851 = 0;
break;
@@ -1100,7 +1101,6 @@ void daNpc_Zl1_c::checkOrder() {
field_0x84A = 0;
field_0x7D7 = true;
}
/* Nonmatching */
}
/* 00002280-00002318 .text chk_talk__11daNpc_Zl1_cFv */
@@ -1241,7 +1241,7 @@ void daNpc_Zl1_c::lookBack() {
targetY = field_0x7C0;
field_0x7D0 = false;
break;
case 4:
case 4: {
fopAc_ac_c* actor = searchByID(mProcId2, &temp6);
if(actor != NULL && temp6 == 0) {
field_0x758.set(actor->current.pos);
@@ -1251,7 +1251,7 @@ void daNpc_Zl1_c::lookBack() {
field_0x7D0 = true;
}
break;
}
case 5:
kyorokyoro();
temp3.set(field_0x758);
src/d/actor/d_a_tag_kk1.cpp
+7 -7
View File
@@ -48,12 +48,12 @@ BOOL daTag_Kk1_c::createInit() {
}
/* 00000128-00000130 .text _draw__11daTag_Kk1_cFv */
bool daTag_Kk1_c::_draw() {
BOOL daTag_Kk1_c::_draw() {
return true;
}
/* 00000130-0000024C .text _execute__11daTag_Kk1_cFv */
bool daTag_Kk1_c::_execute() {
BOOL daTag_Kk1_c::_execute() {
f32 distance = current.pos.abs(dComIfGp_getPlayer(0)->current.pos);
f32 vert_distance = dComIfGp_getPlayer(0)->current.pos.y - current.pos.y;
mTagSet = false;
@@ -69,7 +69,7 @@ bool daTag_Kk1_c::_execute() {
/* 0000024C-000002A0 .text _delete__11daTag_Kk1_cFv */
bool daTag_Kk1_c::_delete() {
BOOL daTag_Kk1_c::_delete() {
if (l_HIO.mNo >= 0) {
mDoHIO_deleteChild(l_HIO.mNo);
l_HIO.mNo = -1;
@@ -107,22 +107,22 @@ cPhs_State daTag_Kk1_c::_create() {
/* 00000694-000006B4 .text daTag_Kk1_Create__FP10fopAc_ac_c */
static cPhs_State daTag_Kk1_Create(fopAc_ac_c* obj) {
(static_cast<daTag_Kk1_c*>(obj))->_create();
return (static_cast<daTag_Kk1_c*>(obj))->_create();
}
/* 000006B4-000006D4 .text daTag_Kk1_Delete__FP11daTag_Kk1_c */
static BOOL daTag_Kk1_Delete(daTag_Kk1_c* obj) {
(static_cast<daTag_Kk1_c*>(obj))->_delete();
return (static_cast<daTag_Kk1_c*>(obj))->_delete();
}
/* 000006D4-000006F4 .text daTag_Kk1_Execute__FP11daTag_Kk1_c */
static BOOL daTag_Kk1_Execute(daTag_Kk1_c* obj) {
(static_cast<daTag_Kk1_c*>(obj))->_execute();
return (static_cast<daTag_Kk1_c*>(obj))->_execute();
}
/* 000006F4-00000714 .text daTag_Kk1_Draw__FP11daTag_Kk1_c */
static BOOL daTag_Kk1_Draw(daTag_Kk1_c* obj) {
(static_cast<daTag_Kk1_c*>(obj))->_draw();
return (static_cast<daTag_Kk1_c*>(obj))->_draw();
}
/* 00000714-0000071C .text daTag_Kk1_IsDelete__FP11daTag_Kk1_c */
src/d/d_file_error.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "d/d_file_error.h"
#include "dolphin/types.h"
#include "f_op/f_op_msg_mng.h"
#include "m_Do/m_do_controller_pad.h"
#include "m_Do/m_Do_controller_pad.h"
dFe_HIO_c g_feHIO;
src/d/d_file_select.cpp
+2 -2
View File
@@ -2468,12 +2468,12 @@ void dFile_select_c::yesNoPaneMoveSet() {
/* 8018A46C-8018A4B0 .text MessagePaneMove__14dFile_select_cFffffsUci */
int dFile_select_c::MessagePaneMove(f32 param_1, f32 param_2, f32 param_3, f32 param_4, s16 param_5, u8 param_6, int param_7) {
PaneTranceMessageBase(field_0x3930 - param_5, g_fsHIO.field_0x32, param_1, param_2, param_3, param_4, param_6, param_7);
return PaneTranceMessageBase(field_0x3930 - param_5, g_fsHIO.field_0x32, param_1, param_2, param_3, param_4, param_6, param_7);
}
/* 8018A4B0-8018A4F4 .text recInfoPaneMove__14dFile_select_cFffffsUci */
int dFile_select_c::recInfoPaneMove(f32 param_1, f32 param_2, f32 param_3, f32 param_4, s16 param_5, u8 param_6, int param_7) {
PaneTranceRecBase(field_0x3930 - param_5, g_fsHIO.field_0x2F, param_1, param_2, param_3, param_4, param_6, param_7);
return PaneTranceRecBase(field_0x3930 - param_5, g_fsHIO.field_0x2F, param_1, param_2, param_3, param_4, param_6, param_7);
}
/* 8018A4F4-8018A644 .text menuPaneMove__14dFile_select_cFffsUci */