mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-03 18:06:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup of f_pc/f_op files (#2254)

Browse Source 
* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_pc/f_pc_layer.cpp
+35 -37
View File
@@ -3,7 +3,6 @@
* Framework - Process Layer
*/
#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_method_iter.h"
#include "f_pc/f_pc_method_tag.h"
@@ -17,7 +16,7 @@ void fpcLy_CancelQTo(process_method_tag_class* i_methods) {
/* 800215A8-800215CC 0024+00 s=0 e=3 z=0 None .text
* fpcLy_ToCancelQ__FP11layer_classP24process_method_tag_class */
s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) {
return fpcMtdTg_ToMethodQ(&i_layer->mCancelList, i_methods);
return fpcMtdTg_ToMethodQ(&i_layer->cancel_list, i_methods);
}
/* 800215CC-800215F8 002C+00 s=1 e=0 z=0 None .text
@@ -29,13 +28,13 @@ bool fpcLy_CancelMethod(process_method_tag_class* i_layer) {
/* 800215F8-8002161C 0024+00 s=0 e=1 z=0 None .text
* fpcLy_IntoQueue__FP11layer_classiP16create_tag_classi */
s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) {
return cTg_InsertToTree(&i_layer->mNodeListTree, i_treeListNo, i_createTag, i_no);
return cTg_InsertToTree(&i_layer->node_tree, i_treeListNo, i_createTag, i_no);
}
/* 8002161C-80021640 0024+00 s=0 e=1 z=0 None .text
* fpcLy_ToQueue__FP11layer_classiP16create_tag_class */
s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) {
return cTg_AdditionToTree(&i_layer->mNodeListTree, i_treeListNo, i_createTag);
return cTg_AdditionToTree(&i_layer->node_tree, i_treeListNo, i_createTag);
}
/* 80021640-80021664 0024+00 s=0 e=1 z=0 None .text
@@ -46,57 +45,55 @@ s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
/* 80021664-80021678 0014+00 s=0 e=1 z=0 None .text fpcLy_IsDeletingMesg__FP11layer_class */
BOOL fpcLy_IsDeletingMesg(layer_class* i_layer) {
return i_layer->counts.mDeletingCount > 0;
return i_layer->counts.delete_count > 0;
}
/* 80021678-80021688 0010+00 s=0 e=1 z=0 None .text fpcLy_DeletingMesg__FP11layer_class */
void fpcLy_DeletingMesg(layer_class* i_layer) {
i_layer->counts.mDeletingCount++;
i_layer->counts.delete_count++;
}
/* 80021688-800216A0 0018+00 s=0 e=1 z=0 None .text fpcLy_DeletedMesg__FP11layer_class */
void fpcLy_DeletedMesg(layer_class* i_layer) {
if (i_layer->counts.mDeletingCount > 0) {
i_layer->counts.mDeletingCount--;
if (i_layer->counts.delete_count > 0) {
i_layer->counts.delete_count--;
}
}
/* 800216A0-800216B4 0014+00 s=0 e=2 z=0 None .text fpcLy_IsCreatingMesg__FP11layer_class */
BOOL fpcLy_IsCreatingMesg(layer_class* i_layer) {
return i_layer->counts.mCreatingCount > 0;
return i_layer->counts.create_count > 0;
}
/* 800216B4-800216C4 0010+00 s=0 e=2 z=0 None .text fpcLy_CreatingMesg__FP11layer_class */
void fpcLy_CreatingMesg(layer_class* i_layer) {
i_layer->counts.mCreatingCount++;
i_layer->counts.create_count++;
}
/* 800216C4-800216DC 0018+00 s=0 e=2 z=0 None .text fpcLy_CreatedMesg__FP11layer_class */
void fpcLy_CreatedMesg(layer_class* i_layer) {
if (i_layer->counts.mCreatingCount > 0) {
i_layer->counts.mCreatingCount--;
if (i_layer->counts.create_count > 0) {
i_layer->counts.create_count--;
}
}
/* ############################################################################################## */
/* 803A39B0-803A39DC 002C+00 s=2 e=0 z=0 None .data l_fpcLy_Crear */
layer_class l_fpcLy_Crear = {
NULL, NULL, 0, 0xFFFFFFFF, NULL, 0, NULL, NULL, NULL, 0, 0, 0,
};
/* 803A39DC-803A39E8 000C+00 s=3 e=0 z=0 None .data l_fpcLy_LayerList */
node_list_class l_fpcLy_LayerList = {
static node_list_class l_fpcLy_LayerList = {
NULL,
NULL,
0,
};
/* 800216DC-800216EC 0010+00 s=2 e=3 z=0 None .text fpcLy_RootLayer__Fv */
layer_class* fpcLy_RootLayer(void) {
layer_class* fpcLy_RootLayer() {
return (layer_class*)l_fpcLy_LayerList.mpHead;
}
/* ############################################################################################## */
/* 80450D18-80450D1C 0004+00 s=2 e=0 z=0 None .sbss l_fpcLy_CurrLayer_p */
static layer_class* l_fpcLy_CurrLayer_p;
@@ -114,19 +111,20 @@ layer_class* fpcLy_CurrentLayer() {
layer_class* fpcLy_Search(fpc_ProcID i_id) {
layer_class* layer_p = fpcLy_RootLayer();
while (layer_p != NULL) {
if (layer_p->mLayerID == i_id) {
if (layer_p->layer_id == i_id) {
return layer_p;
}
layer_p = (layer_class*)layer_p->mNode.mpNextNode;
layer_p = (layer_class*)layer_p->node.mpNextNode;
}
return NULL;
}
/* 8002174C-800217BC 0070+00 s=0 e=5 z=0 None .text fpcLy_Layer__FUi */
layer_class* fpcLy_Layer(fpc_ProcID i_id) {
if (i_id == 0 || fpcLy_RootLayer()->mLayerID == i_id) {
if (i_id == 0 || fpcLy_RootLayer()->layer_id == i_id) {
return fpcLy_RootLayer();
} else if (i_id == ~2 || fpcLy_CurrentLayer()->mLayerID == i_id) {
} else if (i_id == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->layer_id == i_id) {
return fpcLy_CurrentLayer();
} else {
return fpcLy_Search(i_id);
@@ -140,40 +138,40 @@ void fpcLy_Regist(layer_class* i_layer) {
/* 800217E8-8002189C 00B4+00 s=0 e=1 z=0 None .text fpcLy_Delete__FP11layer_class */
s32 fpcLy_Delete(layer_class* i_layer) {
if (i_layer->mNodeListTree.mpLists->mSize == 0 && i_layer->mCancelList.mSize == 0) {
if (i_layer->node_tree.mpLists->mSize == 0 && i_layer->cancel_list.mSize == 0) {
cLs_SingleCut((node_class*)i_layer);
*i_layer = l_fpcLy_Crear;
return 1;
} else {
return 0;
}
return 0;
}
/* 8002189C-800218C8 002C+00 s=0 e=1 z=0 None .text fpcLy_Cancel__FP11layer_class */
void fpcLy_Cancel(layer_class* i_layer) {
fpcMtdIt_Method(&i_layer->mCancelList, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod);
int fpcLy_Cancel(layer_class* i_layer) {
return fpcMtdIt_Method(&i_layer->cancel_list, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod);
}
/* 800218C8-80021A00 0138+00 s=0 e=2 z=0 None .text
* fpcLy_Create__FP11layer_classPvP15node_list_classi */
void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeList, int i_numLists) {
void* pvVar1;
s32 iVar2;
static BOOL IsInitOfLayerList = TRUE;
static fpc_ProcID layer_id = 0;
static int IsInitOfLayerList = 1;
static int layer_id = 0;
*i_layer = l_fpcLy_Crear;
cNd_Create((node_class*)i_layer, NULL);
i_layer->mLayerID = layer_id++;
i_layer->mpPcNode = static_cast<process_node_class*>(i_node);
if (IsInitOfLayerList == 1) {
IsInitOfLayerList = 0;
i_layer->layer_id = layer_id++;
i_layer->process_node = (process_node_class*)i_node;
if (IsInitOfLayerList == TRUE) {
IsInitOfLayerList = FALSE;
cLs_Create(&l_fpcLy_LayerList);
fpcLy_SetCurrentLayer(i_layer);
}
(i_layer->mNodeListTree).mpLists = i_nodeList;
(i_layer->mNodeListTree).mNumLists = i_numLists;
cTr_Create(&i_layer->mNodeListTree, (i_layer->mNodeListTree).mpLists,
(i_layer->mNodeListTree).mNumLists);
i_layer->node_tree.mpLists = i_nodeList;
i_layer->node_tree.mNumLists = i_numLists;
cTr_Create(&i_layer->node_tree, i_layer->node_tree.mpLists, i_layer->node_tree.mNumLists);
fpcLy_Regist(i_layer);
}