d_a_obj_twGate Matching (#2555)

* d_a_obj_twGate Matching

* d_a_obj_volcbom OK

6 files changed, 16 insertions, 16 deletions

diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp
index a422bea1a2..f9f73276aa 100644
--- a/src/f_pc/f_pc_base.cpp
+++ b/src/f_pc/f_pc_base.cpp
@@ -145,7 +145,7 @@ base_process_class* fpcBs_Create(s16 i_profname, fpc_ProcID i_procID, void* i_ap
     fpcPi_Init(&pprocess->priority, pprocess, pprofile->layer_id, pprofile->list_id,
                 pprofile->list_priority);
 
-    pprocess->init_state = 0;
+    pprocess->state.init_state = 0;
     pprocess->unk_0xA = 0;
     pprocess->id = i_procID;
     pprocess->profname = i_profname;
@@ -164,19 +164,19 @@ int fpcBs_SubCreate(base_process_class* i_proc) {
     case cPhs_NEXT_e:
     case cPhs_COMPLEATE_e:
         fpcBs_DeleteAppend(i_proc);
-        i_proc->create_phase = cPhs_NEXT_e;
+        i_proc->state.create_phase = cPhs_NEXT_e;
         return cPhs_NEXT_e;
     case cPhs_INIT_e:
-    case cPhs_LOADING_e:
-        i_proc->init_state = 1;
-        i_proc->create_phase = cPhs_INIT_e;
+case cPhs_LOADING_e:
+        i_proc->state.init_state = 1;
+        i_proc->state.create_phase = cPhs_INIT_e;
         return cPhs_INIT_e;
     case cPhs_UNK3_e:
-        i_proc->create_phase = cPhs_UNK3_e;
+        i_proc->state.create_phase = cPhs_UNK3_e;
         return cPhs_UNK3_e;
     case cPhs_ERROR_e:
     default:
-        i_proc->create_phase = cPhs_ERROR_e;
+        i_proc->state.create_phase = cPhs_ERROR_e;
         return cPhs_ERROR_e;
     }
 }
diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp
index e365371927..8a2dff317c 100644
--- a/src/f_pc/f_pc_deletor.cpp
+++ b/src/f_pc/f_pc_deletor.cpp
@@ -100,7 +100,7 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
             }
         }
 
-        i_proc->init_state = 3;
+        i_proc->state.init_state = 3;
         return 1;
     }
     
@@ -124,7 +124,7 @@ s32 fpcDt_Delete(void* i_proc) {
         if (fpcCt_IsDoing(proc) == TRUE)
             return 0;
 
-        if (proc->init_state == 3)
+        if (proc->state.init_state == 3)
             return 0;
 
         int ret = fpcDt_ToDeleteQ(proc);
diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp
index bf23306ac1..f6a981ba06 100644
--- a/src/f_pc/f_pc_executor.cpp
+++ b/src/f_pc/f_pc_executor.cpp
@@ -33,7 +33,7 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) {
 
 /* 800213C4-80021418 0054+00 s=0 e=1 z=0  None .text      fpcEx_Execute__FP18base_process_class */
 s32 fpcEx_Execute(base_process_class* i_proc) {
-    if (i_proc->init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE)
+    if (i_proc->state.init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE)
         return 0;
 
     return fpcBs_Execute(i_proc);
@@ -56,7 +56,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) {
         }
 #endif
 
-        i_proc->init_state = 2;
+        i_proc->state.init_state = 2;
         if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->subtype)) {
             fpcLyIt_OnlyHere(&((process_node_class*)i_proc)->layer, (fpcLyIt_OnlyHereFunc)fpcEx_ToLineQ, i_proc);
         }
@@ -71,7 +71,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) {
  */
 s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
     if (fpcLyTg_QueueTo(&i_proc->layer_tag) == 1) {
-        i_proc->init_state = 3;
+        i_proc->state.init_state = 3;
         return 1;
     }
     
diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp
index b1906bf733..bb343afd34 100644
--- a/src/f_pc/f_pc_leaf.cpp
+++ b/src/f_pc/f_pc_leaf.cpp
@@ -57,7 +57,7 @@ int g_fpcLf_type;
 
 /* 80021B14-80021B88 0074+00 s=1 e=0 z=0  None .text      fpcLf_Create__FP14leafdraw_class */
 s32 fpcLf_Create(leafdraw_class* i_leaf) {
-    if (i_leaf->base.init_state == 0) {
+    if (i_leaf->base.state.init_state == 0) {
         leaf_process_profile_definition* pprofile = (leaf_process_profile_definition*)i_leaf->base.profile;
         i_leaf->leaf_methods = pprofile->sub_method;
         i_leaf->base.subtype = fpcBs_MakeOfType(&g_fpcLf_type);
diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp
index 72828c7968..f5c326d20e 100644
--- a/src/f_pc/f_pc_node.cpp
+++ b/src/f_pc/f_pc_node.cpp
@@ -105,7 +105,7 @@ s32 fpcNd_Create(process_node_class* i_procNode) {
     layer_class* save_layer;
     s32 ret;
 
-    if (procnode->base.init_state == 0) {
+    if (procnode->base.state.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;
diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp
index 8d7a4b3a63..896a28b028 100644
--- a/src/f_pc/f_pc_priority.cpp
+++ b/src/f_pc/f_pc_priority.cpp
@@ -85,7 +85,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u
     base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
     BOOL changed = FALSE;
 
-    if (process->init_state == 3)
+    if (process->state.init_state == 3)
         return 0;
 
     if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority))
@@ -108,7 +108,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u
         changed = TRUE;
     }
 
-    if (process->init_state == 0 || process->init_state == 1) {
+    if (process->state.init_state == 0 || process->state.init_state == 1) {
         i_procPriority->current_info = i_procPriority->queue_info;
         return 1;
     }