some cleanup of f_pc/f_op files (#2254)

* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work

1 files changed, 45 insertions, 48 deletions

diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp
index fa103b45ad..0a0156eb06 100644
--- a/src/f_pc/f_pc_node.cpp
+++ b/src/f_pc/f_pc_node.cpp
@@ -8,110 +8,107 @@
 
 /* 800224F0-80022514 0024+00 s=1 e=1 z=0  None .text fpcNd_DrawMethod__FP21nodedraw_method_classPv
  */
-s32 fpcNd_DrawMethod(nodedraw_method_class* i_nodeMethods, void* i_data) {
-    return fpcMtd_Method(i_nodeMethods->mpDrawFunc, i_data);
+s32 fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
+    return fpcMtd_Method(i_method_class->draw_method, i_data);
 }
 
 /* 80022514-80022580 006C+00 s=1 e=0 z=0  None .text      fpcNd_Draw__FP18process_node_class */
 s32 fpcNd_Draw(process_node_class* i_procNode) {
     s32 ret = 0;
-    if (i_procNode->mUnk0 == 0) {
-        layer_class* curLayer_p = fpcLy_CurrentLayer();
-        fpcLy_SetCurrentLayer(&i_procNode->mLayer);
-        ret = fpcNd_DrawMethod(i_procNode->mpNodeMtd, i_procNode);
-        fpcLy_SetCurrentLayer(curLayer_p);
+    if (i_procNode->unk_0x1A8 == 0) {
+        layer_class* save_layer = fpcLy_CurrentLayer();
+        fpcLy_SetCurrentLayer(&i_procNode->layer);
+        ret = fpcNd_DrawMethod(i_procNode->nodedraw_method, i_procNode);
+        fpcLy_SetCurrentLayer(save_layer);
     }
+
     return ret;
 }
 
 /* 80022580-800225DC 005C+00 s=1 e=0 z=0  None .text      fpcNd_Execute__FP18process_node_class */
 s32 fpcNd_Execute(process_node_class* i_procNode) {
     s32 ret;
-    layer_class* curLayer_p = fpcLy_CurrentLayer();
-    fpcLy_SetCurrentLayer(&i_procNode->mLayer);
-    ret = fpcMtd_Execute(&i_procNode->mpNodeMtd->mBase, i_procNode);
-    fpcLy_SetCurrentLayer(curLayer_p);
+    layer_class* save_layer = fpcLy_CurrentLayer();
+    fpcLy_SetCurrentLayer(&i_procNode->layer);
+    ret = fpcMtd_Execute(&i_procNode->nodedraw_method->base, i_procNode);
+    fpcLy_SetCurrentLayer(save_layer);
     return ret;
 }
 
-/* ############################################################################################## */
 /* 80450D40-80450D48 0004+04 s=2 e=11 z=0  None .sbss      g_fpcNd_type */
 int g_fpcNd_type;
 
 /* 800225DC-8002265C 0080+00 s=1 e=0 z=0  None .text      fpcNd_IsCreatingFromUnder__FPv */
 void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
     layer_class* layer;
-    process_node_class* pProcNode = static_cast<process_node_class*>(i_procNode);
-    if (pProcNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, pProcNode->mBase.mSubType) != FALSE)
+    process_node_class* procnode = (process_node_class*)i_procNode;
+    if (procnode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, procnode->base.subtype) != FALSE)
     {
-        layer = &pProcNode->mLayer;
-        if (fpcLy_IsCreatingMesg(layer) == 0) {
+        layer = &procnode->layer;
+        if (fpcLy_IsCreatingMesg(layer) == FALSE) {
             return (process_node_class*)fpcLyIt_Judge(
                 layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL);
         } else {
-            return pProcNode;
+            return procnode;
         }
-    } else {
-        return NULL;
     }
+    
+    return NULL;
 }
 
-/* ############################################################################################## */
 /* 804505E0-804505E8 0004+04 s=1 e=0 z=0  None .sdata     g_fpcNd_IsCheckOfDeleteTiming */
-static s32 g_fpcNd_IsCheckOfDeleteTiming = 1;
+BOOL g_fpcNd_IsCheckOfDeleteTiming = TRUE;
 
 /* 8002265C-8002269C 0040+00 s=0 e=2 z=0  None .text fpcNd_IsDeleteTiming__FP18process_node_class
  */
 s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
-    if (g_fpcNd_IsCheckOfDeleteTiming == 1 && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) {
+    if (g_fpcNd_IsCheckOfDeleteTiming == TRUE && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) {
         return 0;
-    } else {
-        return 1;
     }
+    
+    return 1;
 }
 
 /* 8002269C-800226C4 0028+00 s=1 e=0 z=0  None .text      fpcNd_IsDelete__FP18process_node_class */
 s32 fpcNd_IsDelete(process_node_class* i_procNode) {
-    return fpcMtd_IsDelete(&i_procNode->mpNodeMtd->mBase, i_procNode);
+    return fpcMtd_IsDelete(&i_procNode->nodedraw_method->base, i_procNode);
 }
 
 /* 800226C4-80022728 0064+00 s=1 e=0 z=0  None .text      fpcNd_Delete__FP18process_node_class */
 s32 fpcNd_Delete(process_node_class* i_procNode) {
-    if ((fpcLy_IsDeletingMesg(&i_procNode->mLayer) == 0) &&
-        fpcMtd_Delete(&i_procNode->mpNodeMtd->mBase, i_procNode) == 1)
+    if (!fpcLy_IsDeletingMesg(&i_procNode->layer) &&
+        fpcMtd_Delete(&i_procNode->nodedraw_method->base, i_procNode) == 1)
     {
-        i_procNode->mBase.mSubType = 0;
-        return fpcLy_Delete(&i_procNode->mLayer);
-    } else {
-        return 0;
+        i_procNode->base.subtype = 0;
+        return fpcLy_Delete(&i_procNode->layer);
     }
+
+    return 0;
 }
 
 /* 80022728-800227C4 009C+00 s=1 e=0 z=0  None .text      fpcNd_Create__FP18process_node_class */
 s32 fpcNd_Create(process_node_class* i_procNode) {
-    // this cast looks like a fake match, but it doesn't match without the cast, naive approach
-    // swaps r31 and r30 most likely it gets casted to another unknown struct
-    process_node_class* pProcNode = (process_node_class*)i_procNode;
-    layer_class* curLayer_p;
+    process_node_class* procnode = (process_node_class*)i_procNode;
+    layer_class* save_layer;
     s32 ret;
-    if (pProcNode->mBase.mInitState == 0) {
-        node_process_profile_definition* pProcProfileDef =
-            (node_process_profile_definition*)pProcNode->mBase.mpProf;
-        pProcNode->mBase.mSubType = fpcBs_MakeOfType(&g_fpcNd_type);
-        pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->sub_method;
-        fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10);
-        pProcNode->mUnk0 = 0;
+
+    if (procnode->base.init_state == 0) {
+        node_process_profile_definition* pprofile = (node_process_profile_definition*)procnode->base.profile;
+        procnode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type);
+        procnode->nodedraw_method = (nodedraw_method_class*)pprofile->sub_methods;
+        fpcLy_Create(&procnode->layer, procnode, procnode->layer_nodelist, 16);
+        procnode->unk_0x1A8 = 0;
     }
-    curLayer_p = fpcLy_CurrentLayer();
-    fpcLy_SetCurrentLayer(&pProcNode->mLayer);
-    ret = fpcMtd_Create(&pProcNode->mpNodeMtd->mBase, pProcNode);
-    fpcLy_SetCurrentLayer(curLayer_p);
+
+    save_layer = fpcLy_CurrentLayer();
+    fpcLy_SetCurrentLayer(&procnode->layer);
+    ret = fpcMtd_Create(&procnode->nodedraw_method->base, procnode);
+    fpcLy_SetCurrentLayer(save_layer);
     return ret;
 }
 
-/* ############################################################################################## */
 /* 803A3A20-803A3A38 0014+04 s=0 e=9 z=0  None .data      g_fpcNd_Method */
 nodedraw_method_class g_fpcNd_Method = {
     (process_method_func)fpcNd_Create, (process_method_func)fpcNd_Delete,
     (process_method_func)fpcNd_Execute, (process_method_func)fpcNd_IsDelete,
-    (process_method_func)fpcNd_Draw};
\ No newline at end of file
+    (process_method_func)fpcNd_Draw};