diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2023-04-29 17:31:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 17:31:04 -0700 |
| commit | 0c4e853e4bc94bfe736c5575075334cc6e3d6397 (patch) | |
| tree | cd4a2dfa640349ff7454d2b935e6a97782e8744d /src/d | |
| parent | ca4ebc90127acd223418c774bd0235bb80e1d672 (diff) | |
fix functions not returning values (#324)
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/a/d_a_npc.cpp | 9 | ||||
| -rw-r--r-- | src/d/msg/d_msg_flow.cpp | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 6135791a6d..eee828d49e 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -813,8 +813,8 @@ static int daNpcT_subIdx(int param_0, int param_1, u16& param_2, int param_3) { } /* 80145AC4-80145B20 140404 005C+00 5/5 0/0 0/0 .text daNpcT_incIdx__FiRUsii */ -static void daNpcT_incIdx(int param_0, u16& param_1, int param_2, int param_3) { - param_3 ? daNpcT_subIdx(1,param_0,param_1,param_2) : daNpcT_addIdx(1,param_0,param_1,param_2); +static int daNpcT_incIdx(int param_0, u16& param_1, int param_2, int param_3) { + return param_3 ? daNpcT_subIdx(1,param_0,param_1,param_2) : daNpcT_addIdx(1,param_0,param_1,param_2); } /* 80145B20-80145B7C 140460 005C+00 3/3 0/0 0/0 .text daNpcT_decIdx__FiRUsii */ @@ -926,11 +926,10 @@ int daNpcT_Path_c::setNextIdx(int param_0) { u16 numPnts = getNumPnts(); if (chkClose() != 0 && numPnts == param_0) { - daNpcT_incIdx(param_0,mIdx,1,mDirection); - return; + return daNpcT_incIdx(param_0,mIdx,1,mDirection); } - daNpcT_incIdx(param_0,mIdx,0,mDirection); + return daNpcT_incIdx(param_0,mIdx,0,mDirection); } /* 80145E38-80145FB4 140778 017C+00 0/0 0/0 1/1 .text getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi */ diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 9ee7d62214..a0d16cf3b6 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -954,7 +954,9 @@ int dMsgFlow_c::query005(mesg_flow_node_branch*, fopAc_ac_c*, int) { /* 8024B2F8-8024B32C 245C38 0034+00 1/0 0/0 0/0 .text * query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query006(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int) { - mChoiceNo = query005(flow_node, param_1, 0); + int r3 = query005(flow_node, param_1, 0); + mChoiceNo = r3; + return r3; } /* 8024B32C-8024B45C 245C6C 0130+00 1/0 0/0 0/0 .text |