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, 61 insertions, 63 deletions

diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp
index 9f9713faa2..f6ba909558 100644
--- a/src/f_pc/f_pc_priority.cpp
+++ b/src/f_pc/f_pc_priority.cpp
@@ -10,36 +10,34 @@
 /* 80023130-80023150 0020+00 s=0 e=1 z=0  None .text fpcPi_IsInQueue__FP22process_priority_class
  */
 s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) {
-    return cTg_IsUse(&i_procPriority->mBase);
+    return cTg_IsUse(&i_procPriority->base);
 }
 
 /* 80023150-80023188 0038+00 s=1 e=0 z=0  None .text      fpcPi_QueueTo__FP22process_priority_class
  */
 s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
-    cTg_SingleCut(&i_procPriority->mBase);
-    fpcLy_CancelQTo(&i_procPriority->mMtdTag);
+    cTg_SingleCut(&i_procPriority->base);
+    fpcLy_CancelQTo(&i_procPriority->method_tag);
     return 1;
 }
 
-/* ############################################################################################## */
 /* 803F4E58-803F4E68 000C+04 s=2 e=0 z=0  None .bss       l_fpcPi_Queue */
 static node_list_class l_fpcPi_Queue;
 
 /* 80023188-80023214 008C+00 s=1 e=0 z=0  None .text      fpcPi_ToQueue__FP22process_priority_class
  */
 s32 fpcPi_ToQueue(process_priority_class* i_procPriority) {
-    u32 layer = i_procPriority->mInfoQ.mLayer;
+    fpc_ProcID layer = i_procPriority->queue_info.layer_id;
 
-    if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->mBase)) {
-        if (layer != 0xFFFFFFFD) {
+    if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->base)) {
+        if (layer != fpcLy_CURRENT_e) {
             layer_class* pLayer = fpcLy_Layer(layer);
 
-            if (!fpcLy_ToCancelQ(pLayer, &i_procPriority->mMtdTag)) {
-                cTg_SingleCut(&i_procPriority->mBase);
+            if (!fpcLy_ToCancelQ(pLayer, &i_procPriority->method_tag)) {
+                cTg_SingleCut(&i_procPriority->base);
                 return 0;
             }
         }
-
         return 1;
     }
 
@@ -51,10 +49,10 @@ process_priority_class* fpcPi_GetFromQueue() {
     process_priority_class* i_procPriority = (process_priority_class*)cTg_GetFirst(&l_fpcPi_Queue);
 
     if (i_procPriority != NULL) {
-        base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
-        process_priority_class* pProcPi = &pProc->mPi;
-        fpcLy_CancelQTo(&pProcPi->mMtdTag);
-        return pProcPi;
+        base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
+        process_priority_class* ppriority = &process->priority;
+        fpcLy_CancelQTo(&ppriority->method_tag);
+        return ppriority;
     }
 
     return NULL;
@@ -64,21 +62,21 @@ process_priority_class* fpcPi_GetFromQueue() {
  */
 s32 fpcPi_Delete(process_priority_class* i_procPriority) {
     static process_priority_queue_info crear = {
-        0xFFFFFFFF,
-        0xFFFF,
+        fpcLy_NONE_e,
         0xFFFF,
+        fpcPi_NONE_e,
     };
 
     fpcPi_QueueTo(i_procPriority);
-    i_procPriority->mInfoQ.mLayer = crear.mLayer;
-    i_procPriority->mInfoQ.mListID = crear.mListID;
-    i_procPriority->mInfoQ.mListPrio = crear.mListPrio;
+    i_procPriority->queue_info.layer_id = crear.layer_id;
+    i_procPriority->queue_info.list_id = crear.list_id;
+    i_procPriority->queue_info.list_priority = crear.list_priority;
     return 1;
 }
 
 /* 800232B4-800232E8 0034+00 s=2 e=0 z=0  None .text      fpcPi_IsNormal__FUiUsUs */
-s32 fpcPi_IsNormal(fpc_ProcID i_layer, u16 i_listID, u16 i_priority) {
-    if ((i_layer < 0xFFFFFFFE) && (i_listID < 0xFFFE) && (i_priority < 0xFFFE))
+s32 fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
+    if ((i_layerID < fpcLy_SPECIAL_e) && (i_listID < 0xFFFE) && (i_priority < fpcPi_SPECIAL_e))
         return 1;
 
     return 0;
@@ -86,43 +84,43 @@ s32 fpcPi_IsNormal(fpc_ProcID i_layer, u16 i_listID, u16 i_priority) {
 
 /* 800232E8-80023428 0140+00 s=0 e=3 z=0  None .text
  * fpcPi_Change__FP22process_priority_classUiUsUs               */
-s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layer, u16 i_listID, u16 i_priority) {
-    base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
-    BOOL changed = 0;
+s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
+    base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
+    BOOL changed = FALSE;
 
-    if (pProc->mInitState == 3)
+    if (process->init_state == 3)
         return 0;
 
-    if (!fpcPi_IsNormal(i_layer, i_listID, i_priority))
+    if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority))
         return 0;
 
-    i_procPriority->mInfoQ.mLayer = i_procPriority->mInfoCurr.mLayer;
-    i_procPriority->mInfoQ.mListID = i_procPriority->mInfoCurr.mListID;
-    i_procPriority->mInfoQ.mListPrio = i_procPriority->mInfoCurr.mListPrio;
+    i_procPriority->queue_info.layer_id = i_procPriority->current_info.layer_id;
+    i_procPriority->queue_info.list_id = i_procPriority->current_info.list_id;
+    i_procPriority->queue_info.list_priority = i_procPriority->current_info.list_priority;
 
-    if (i_layer != 0xFFFFFFFD && i_procPriority->mInfoCurr.mLayer != i_layer) {
-        i_procPriority->mInfoQ.mLayer = i_layer;
-        changed = 1;
+    if (i_layerID != fpcLy_CURRENT_e && i_procPriority->current_info.layer_id != i_layerID) {
+        i_procPriority->queue_info.layer_id = i_layerID;
+        changed = TRUE;
     }
 
-    if (i_listID != 0xFFFD && i_procPriority->mInfoCurr.mListID != i_listID) {
-        i_procPriority->mInfoQ.mListID = i_listID;
-        changed = 1;
+    if (i_listID != 0xFFFD && i_procPriority->current_info.list_id != i_listID) {
+        i_procPriority->queue_info.list_id = i_listID;
+        changed = TRUE;
     }
 
-    if (i_priority != 0xFFFD && i_procPriority->mInfoCurr.mListPrio != i_priority) {
-        i_procPriority->mInfoQ.mListPrio = i_priority;
-        changed = 1;
+    if (i_priority != fpcPi_CURRENT_e && i_procPriority->current_info.list_priority != i_priority) {
+        i_procPriority->queue_info.list_priority = i_priority;
+        changed = TRUE;
     }
 
-    if (pProc->mInitState == 0 || pProc->mInitState == 1) {
-        i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer;
-        i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID;
-        i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio;
+    if (process->init_state == 0 || process->init_state == 1) {
+        i_procPriority->current_info.layer_id = i_procPriority->queue_info.layer_id;
+        i_procPriority->current_info.list_id = i_procPriority->queue_info.list_id;
+        i_procPriority->current_info.list_priority = i_procPriority->queue_info.list_priority;
         return 1;
     }
 
-    if (changed == 1)
+    if (changed == TRUE)
         return fpcPi_ToQueue(i_procPriority);
     else
         return 0;
@@ -132,15 +130,16 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layer, u16
 s32 fpcPi_Handler() {
     process_priority_class* i_procPriority;
     while (i_procPriority = fpcPi_GetFromQueue()) {
-        base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
-        layer_management_tag_class* pLayerTag = &pProc->mLyTg;
-        line_tag* pLineTag = &pProc->mLnTg;
-        if (fpcLyTg_Move(pLayerTag, i_procPriority->mInfoQ.mLayer, i_procPriority->mInfoQ.mListID,
-                         i_procPriority->mInfoQ.mListPrio) == 1) {
-            fpcLnTg_Move(pLineTag, i_procPriority->mInfoCurr.mListID);
-            i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer;
-            i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID;
-            i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio;
+        base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
+        layer_management_tag_class* pLayerTag = &process->layer_tag;
+        line_tag* pLineTag = &process->line_tag_;
+
+        if (fpcLyTg_Move(pLayerTag, i_procPriority->queue_info.layer_id, i_procPriority->queue_info.list_id,
+                         i_procPriority->queue_info.list_priority) == 1) {
+            fpcLnTg_Move(pLineTag, i_procPriority->current_info.list_id);
+            i_procPriority->current_info.layer_id = i_procPriority->queue_info.layer_id;
+            i_procPriority->current_info.list_id = i_procPriority->queue_info.list_id;
+            i_procPriority->current_info.list_priority = i_procPriority->queue_info.list_priority;
         } else {
             return 0;
         }
@@ -151,23 +150,22 @@ s32 fpcPi_Handler() {
 
 /* 800234BC-80023564 00A8+00 s=0 e=1 z=0  None .text
  * fpcPi_Init__FP22process_priority_classPvUiUsUs               */
-s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layer, u16 i_listID,
+s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID,
                u16 i_priority) {
-    if (!fpcPi_IsNormal(i_layer, i_listID, i_priority))
+    if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority))
         return 0;
 
-    i_procPriority->mInfoQ.mLayer = i_layer;
-    i_procPriority->mInfoQ.mListID = i_listID;
-    i_procPriority->mInfoQ.mListPrio = i_priority;
+    i_procPriority->queue_info.layer_id = i_layerID;
+    i_procPriority->queue_info.list_id = i_listID;
+    i_procPriority->queue_info.list_priority = i_priority;
 
-    i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer;
-    i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID;
-    i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio;
-    cTg_Create(&i_procPriority->mBase, i_data);
-    fpcMtdTg_Init(&i_procPriority->mMtdTag, (process_method_tag_func)fpcPi_Delete, i_procPriority);
+    i_procPriority->current_info.layer_id = i_procPriority->queue_info.layer_id;
+    i_procPriority->current_info.list_id = i_procPriority->queue_info.list_id;
+    i_procPriority->current_info.list_priority = i_procPriority->queue_info.list_priority;
+    cTg_Create(&i_procPriority->base, i_data);
+    fpcMtdTg_Init(&i_procPriority->method_tag, (process_method_tag_func)fpcPi_Delete, i_procPriority);
     return 1;
 }
 
-/* ############################################################################################## */
 /* 804505F0-804505F8 0008+00 s=0 e=5 z=1  None .sdata     None */
 s8 data_804505F0 = 0xFF;