fix functions not returning values (#324)

4 files changed, 11 insertions, 10 deletions

diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp
index 0ce1ce732b..b42a027f00 100644
--- a/src/DynamicLink.cpp
+++ b/src/DynamicLink.cpp
@@ -194,9 +194,9 @@ bool DynamicModuleControl::initialize() {
 
 /* 80262794-802627C0 25D0D4 002C+00 1/1 0/0 0/0 .text            callback__20DynamicModuleControlFPv
  */
-void* DynamicModuleControl::callback(void* moduleControlPtr) {
+bool DynamicModuleControl::callback(void* moduleControlPtr) {
     DynamicModuleControl* moduleControl = (DynamicModuleControl*)moduleControlPtr;
-    moduleControl->do_load();
+    return moduleControl->do_load();
 }
 
 /* 802627C0-802627E8 25D100 0028+00 1/1 0/0 0/0 .text            calcSum2__FPCUsUl */
@@ -317,7 +317,7 @@ BOOL DynamicModuleControl::do_load_async() {
         if (mModule != NULL) {
             return true;
         }
-        mAsyncLoadCallback = mDoDvdThd_callback_c::create(DynamicModuleControl::callback, this);
+        mAsyncLoadCallback = mDoDvdThd_callback_c::create((mDoDvdThd_callback_func)DynamicModuleControl::callback, this);
         if (mAsyncLoadCallback == NULL) {
             OSReport_Error(
                 // "DynamicModuleControl::do_load_async() async load callback entry failure [%s]\n"
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
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index 10c07b367e..09e1786306 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -291,7 +291,7 @@ void fopMsgM_setMessageID(unsigned int msg_id) {
 
 /* 80020108-80020158 01AA48 0050+00 0/0 2/2 0/0 .text            fopMsgM_Create__FsPFPv_iPv */
 u32 fopMsgM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_process) {
-    fpcM_Create(i_procName, i_createFunc, i_process);
+    return fpcM_Create(i_procName, i_createFunc, i_process);
 }
 
 /* 80020158-80020160 -00001 0008+00 0/0 0/0 0/0 .text            setAlpha__7J2DPaneFUc */