summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJcw87 <Jcw87@users.noreply.github.com>2023-09-15 04:15:46 -0700
committerGitHub <noreply@github.com>2023-09-15 04:15:46 -0700
commitf834379a8b60e0d3308e5aa064a910cead92b899 (patch)
tree170450153c98ff5e1ea743f38121e72e75439741 /src
parent4ab104f390e401c7dfdc9697374c17c223650661 (diff)
fix functions not returning values (#1926)
Diffstat (limited to 'src')
-rw-r--r--src/d/a/d_a_npc_cd.cpp1
-rw-r--r--src/d/a/d_a_npc_cd2.cpp1
-rw-r--r--src/d/d_name.cpp16
-rw-r--r--src/f_op/f_op_msg_mng.cpp6
4 files changed, 16 insertions, 8 deletions
diff --git a/src/d/a/d_a_npc_cd.cpp b/src/d/a/d_a_npc_cd.cpp
index b83fe83d27..e54ea7604e 100644
--- a/src/d/a/d_a_npc_cd.cpp
+++ b/src/d/a/d_a_npc_cd.cpp
@@ -682,6 +682,7 @@ int daNpcCd_c::loadResrc(int param_0, int param_1) {
if (result != cPhs_COMPLEATE_e) {
return result;
}
+ return result;
}
/* 80156C50-80156D1C 151590 00CC+00 0/0 0/0 1/1 .text removeResrc__9daNpcCd_cFii */
diff --git a/src/d/a/d_a_npc_cd2.cpp b/src/d/a/d_a_npc_cd2.cpp
index d21840bd8a..43dae827ed 100644
--- a/src/d/a/d_a_npc_cd2.cpp
+++ b/src/d/a/d_a_npc_cd2.cpp
@@ -1790,6 +1790,7 @@ int daNpcCd2_c::loadResrc(int idx, int param_1) {
if (result != cPhs_COMPLEATE_e) {
return result;
}
+ return result;
}
/* 80158CBC-80158D88 1535FC 00CC+00 0/0 0/0 4/4 .text removeResrc__10daNpcCd2_cFii */
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index d0ff478015..34f1b3dcdb 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -1422,17 +1422,23 @@ void dName_c::NameStrSet() {
/* 80251048-80251094 24B988 004C+00 6/6 0/0 0/0 .text getMenuPosIdx__7dName_cFUc */
s32 dName_c::getMenuPosIdx(u8 selPos) {
+ s32 result;
switch (selPos) {
case 0:
- return 0;
+ result = 0;
+ break;
case 1:
- return 1;
+ result = 1;
+ break;
case 2:
- return 2;
+ result = 2;
+ break;
case 3:
- return 3;
+ result = 3;
+ break;
}
- //!@bug UB: no default return
+ return result;
+ //!@bug UB: uninitialized default return
}
/* 80251094-8025115C 24B9D4 00C8+00 1/0 0/0 0/0 .text draw__14dDlst_NameIN_cFv */
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index fd6e89e8a2..8a85eefb61 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -406,12 +406,12 @@ void J2DPicture::setBlendRatio(f32 param_0, f32 param_1) {
/* 80020338-80020368 01AC78 0030+00 0/0 1/0 0/0 .text append__10J2DPictureFPCcf */
bool J2DPicture::append(char const* param_0, f32 param_1) {
- insert(param_0, mTextureCount, param_1);
+ return insert(param_0, mTextureCount, param_1);
}
/* 80020368-8002039C 01ACA8 0034+00 0/0 1/0 0/0 .text insert__10J2DPictureFPCcUcf */
-void J2DPicture::insert(char const* param_0, u8 param_1, f32 param_2) {
- insert(param_0, NULL, param_1, param_2);
+bool J2DPicture::insert(char const* param_0, u8 param_1, f32 param_2) {
+ return insert(param_0, NULL, param_1, param_2);
}
/* 8002039C-800203E0 01ACDC 0044+00 0/0 3/3 0/0 .text fopMsgM_createExpHeap__FUlP7JKRHeap