mirror of
https://github.com/zeldaret/tp
synced 2026-07-07 22:22:05 -04:00
f_pc mostly linked for Wii/Shield (#3015)
This commit is contained in:
@@ -209,8 +209,8 @@ void dDvdErrorMsg_c::draw(s32 status) {
|
||||
JFWDisplay::getManager()->resetFader();
|
||||
}
|
||||
|
||||
u8 dDvdErrorMsg_c::execute() {
|
||||
static u8 l_dvdError;
|
||||
bool dDvdErrorMsg_c::execute() {
|
||||
static bool l_dvdError;
|
||||
|
||||
s32 drive_status = DVDGetDriveStatus();
|
||||
if (drive_status != DVD_STATE_END && drive_status != DVD_STATE_BUSY && !l_dvdError) {
|
||||
|
||||
@@ -95,8 +95,8 @@ int fpcBs_Delete(base_process_class* i_proc) {
|
||||
JSUList<Z2SoundObjBase>* allList = Z2GetAudioMgr()->getAllList();
|
||||
|
||||
for (JSUListIterator<Z2SoundObjBase> it(allList->getFirst()); it != allList->getEnd(); it++) {
|
||||
static JSULink<Z2SoundObjBase>* DUMMY_FILL_IT = NULL;
|
||||
static Z2SoundObjBase* DUMMY_FILL_P = NULL;
|
||||
static JSULink<Z2SoundObjBase>* DUMMY_FILL_IT = (JSULink<Z2SoundObjBase>*)0xdddddddd;
|
||||
static Z2SoundObjBase* DUMMY_FILL_P = (Z2SoundObjBase*)0xdddddddd;
|
||||
if (it == DUMMY_FILL_IT || it.getObject() == DUMMY_FILL_P) {
|
||||
const char* stageName = dStage_getName2(profname, 0);
|
||||
if (stageName == NULL) {
|
||||
@@ -154,7 +154,7 @@ int fpcBs_SubCreate(base_process_class* i_proc) {
|
||||
i_proc->state.create_phase = cPhs_NEXT_e;
|
||||
return cPhs_NEXT_e;
|
||||
case cPhs_INIT_e:
|
||||
case cPhs_LOADING_e:
|
||||
case cPhs_LOADING_e:
|
||||
i_proc->state.init_state = 1;
|
||||
i_proc->state.create_phase = cPhs_INIT_e;
|
||||
return cPhs_INIT_e;
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
#include "f_pc/f_pc_debug_sv.h"
|
||||
|
||||
BOOL fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id) {
|
||||
create_request* req = (create_request*)i_createTag->base.mpTagData;
|
||||
if (req->id == *i_id) {
|
||||
fpc_ProcID id = ((create_request*)i_createTag->base.mpTagData)->id;
|
||||
if (id == *i_id) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
|
||||
@@ -15,7 +15,7 @@ void fpcCtTg_CreateQTo(create_tag* i_createTag) {
|
||||
cTg_SingleCut(&i_createTag->base);
|
||||
}
|
||||
|
||||
s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data) {
|
||||
int fpcCtTg_Init(create_tag* i_createTag, void* i_data) {
|
||||
cTg_Create(&i_createTag->base, i_data);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag) {
|
||||
cTg_SingleCut(&i_deleteTag->base);
|
||||
}
|
||||
|
||||
s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
|
||||
int fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
|
||||
if (i_deleteTag->timer <= 0) {
|
||||
fpcDtTg_DeleteQTo(i_deleteTag);
|
||||
|
||||
@@ -50,7 +50,7 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) {
|
||||
int fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) {
|
||||
cTg_Create(&i_deleteTag->base, i_data);
|
||||
return 1;
|
||||
}
|
||||
|
||||
+17
-16
@@ -16,7 +16,7 @@ BOOL fpcDt_IsComplete() {
|
||||
return fpcDtTg_IsEmpty();
|
||||
}
|
||||
|
||||
s32 fpcDt_deleteMethod(base_process_class* i_proc) {
|
||||
int fpcDt_deleteMethod(base_process_class* i_proc) {
|
||||
fpc_ProcID id = i_proc->id;
|
||||
layer_class* layer = i_proc->delete_tag.layer;
|
||||
s16 profname = i_proc->profname;
|
||||
@@ -42,7 +42,7 @@ void fpcDt_Handler() {
|
||||
cLsIt_Method(&g_fpcDtTg_Queue, (cNdIt_MethodFunc)fpcDtTg_Do, (void*)fpcDt_deleteMethod);
|
||||
}
|
||||
|
||||
s32 fpcDt_ToQueue(base_process_class* i_proc) {
|
||||
int fpcDt_ToQueue(base_process_class* i_proc) {
|
||||
if (i_proc->unk_0xA != 1 && fpcBs_IsDelete(i_proc) == 1) {
|
||||
if (fpcPi_IsInQueue(&i_proc->priority) == 1) {
|
||||
fpcPi_Delete(&i_proc->priority);
|
||||
@@ -51,13 +51,16 @@ s32 fpcDt_ToQueue(base_process_class* i_proc) {
|
||||
i_proc->delete_tag.layer = i_proc->layer_tag.layer;
|
||||
fpcDtTg_ToDeleteQ(&i_proc->delete_tag);
|
||||
fpcLy_DeletingMesg(i_proc->layer_tag.layer);
|
||||
#if DEBUG
|
||||
i_proc->delete_tag.unk_0x1c = 60;
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
|
||||
int fpcDt_ToDeleteQ(base_process_class* i_proc) {
|
||||
if (i_proc->unk_0xA == 1) {
|
||||
return 0;
|
||||
}
|
||||
@@ -97,39 +100,37 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
|
||||
i_proc->state.init_state = 3;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcDt_Delete(void* i_proc) {
|
||||
base_process_class* proc = (base_process_class*)i_proc;
|
||||
|
||||
if (proc != NULL) {
|
||||
int fpcDt_Delete(void* i_proc) {
|
||||
if (i_proc != NULL) {
|
||||
#if DEBUG
|
||||
if (!fpcBs_Is_JustOfType(g_fpcBs_type, proc->type)) {
|
||||
if (!fpcBs_Is_JustOfType(g_fpcBs_type, ((base_process_class*)i_proc)->type)) {
|
||||
if (g_fpcDbSv_service[12] != NULL) {
|
||||
g_fpcDbSv_service[12](proc);
|
||||
g_fpcDbSv_service[12](i_proc);
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
if (fpcCt_IsDoing(proc) == TRUE)
|
||||
if (fpcCt_IsDoing((base_process_class*)i_proc) == TRUE)
|
||||
return 0;
|
||||
|
||||
if (proc->state.init_state == 3)
|
||||
if (((base_process_class*)i_proc)->state.init_state == 3)
|
||||
return 0;
|
||||
|
||||
int ret = fpcDt_ToDeleteQ(proc);
|
||||
int ret = fpcDt_ToDeleteQ((base_process_class*)i_proc);
|
||||
#if DEBUG
|
||||
if (ret == 0) {
|
||||
if (g_fpcDbSv_service[5] != NULL) {
|
||||
g_fpcDbSv_service[5](proc);
|
||||
g_fpcDbSv_service[5](i_proc);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
#include "f_pc/f_pc_node.h"
|
||||
#include "f_pc/f_pc_pause.h"
|
||||
|
||||
s32 fpcDw_Execute(base_process_class* i_proc) {
|
||||
int fpcDw_Execute(base_process_class* i_proc) {
|
||||
if (!fpcPause_IsEnable(i_proc, 2)) {
|
||||
layer_class* save_layer;
|
||||
s32 ret;
|
||||
int ret;
|
||||
process_method_func draw_func;
|
||||
|
||||
save_layer = fpcLy_CurrentLayer();
|
||||
@@ -31,8 +31,8 @@ s32 fpcDw_Execute(base_process_class* i_proc) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) {
|
||||
s32 ret;
|
||||
int fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) {
|
||||
int ret;
|
||||
cAPIGph_BeforeOfDraw();
|
||||
ret = i_iterHandler(i_func);
|
||||
cAPIGph_AfterOfDraw();
|
||||
|
||||
@@ -4,20 +4,21 @@
|
||||
*/
|
||||
|
||||
#include "f_pc/f_pc_executor.h"
|
||||
#include "f_pc/f_pc_debug_sv.h"
|
||||
#include "f_pc/f_pc_manager.h"
|
||||
#include "f_pc/f_pc_node.h"
|
||||
#include "f_pc/f_pc_pause.h"
|
||||
#include "f_pc/f_pc_searcher.h"
|
||||
#include "f_pc/f_pc_debug_sv.h"
|
||||
|
||||
base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) {
|
||||
return (base_process_class*)fpcLyIt_AllJudge(i_judgeFunc, i_data);
|
||||
}
|
||||
|
||||
base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) {
|
||||
if (i_id + 2 <= 1)
|
||||
return NULL;
|
||||
|
||||
return fpcEx_Search(fpcSch_JudgeByID, &i_id);
|
||||
if (!(i_id == fpcM_UNK_PROCESS_ID_e || i_id == fpcM_ERROR_PROCESS_ID_e)) {
|
||||
return fpcEx_Search(fpcSch_JudgeByID, &i_id);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
BOOL fpcEx_IsExist(fpc_ProcID i_id) {
|
||||
@@ -28,14 +29,14 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcEx_Execute(base_process_class* i_proc) {
|
||||
int fpcEx_Execute(base_process_class* i_proc) {
|
||||
if (i_proc->state.init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE)
|
||||
return 0;
|
||||
|
||||
return fpcBs_Execute(i_proc);
|
||||
}
|
||||
|
||||
s32 fpcEx_ToLineQ(base_process_class* i_proc) {
|
||||
int fpcEx_ToLineQ(base_process_class* i_proc) {
|
||||
base_process_class* process = &i_proc->layer_tag.layer->process_node->base;
|
||||
|
||||
if (i_proc->layer_tag.layer->layer_id == fpcLy_ROOT_e || cTg_IsUse(&process->line_tag_.base) == TRUE) {
|
||||
@@ -62,7 +63,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
|
||||
int fpcEx_ExecuteQTo(base_process_class* i_proc) {
|
||||
if (fpcLyTg_QueueTo(&i_proc->layer_tag) == 1) {
|
||||
i_proc->state.init_state = 3;
|
||||
return 1;
|
||||
@@ -71,7 +72,7 @@ s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcEx_ToExecuteQ(base_process_class* i_proc) {
|
||||
int fpcEx_ToExecuteQ(base_process_class* i_proc) {
|
||||
process_priority_class* priority = &i_proc->priority;
|
||||
if (fpcLyTg_ToQueue(&i_proc->layer_tag, priority->current_info.layer_id, priority->current_info.list_id, priority->current_info.list_priority) == 1) {
|
||||
fpcEx_ToLineQ(i_proc);
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
#include "f_pc/f_pc_load.h"
|
||||
|
||||
s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
|
||||
int fpcFCtRq_Do(fast_create_request* i_createReq) {
|
||||
if (i_createReq->create_func != NULL &&
|
||||
i_createReq->create_func(i_createReq->base.process, i_createReq->data) == 0)
|
||||
{
|
||||
@@ -18,7 +18,7 @@ s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcFCtRq_Delete(fast_create_request* i_createReq) {
|
||||
int fpcFCtRq_Delete(fast_create_request* i_createReq) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ void fpcLy_CancelQTo(process_method_tag_class* i_methods) {
|
||||
fpcMtdTg_MethodQTo(i_methods);
|
||||
}
|
||||
|
||||
s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) {
|
||||
int fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) {
|
||||
return fpcMtdTg_ToMethodQ(&i_layer->cancel_list, i_methods);
|
||||
}
|
||||
|
||||
@@ -23,17 +23,17 @@ BOOL fpcLy_CancelMethod(process_method_tag_class* i_layer) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) {
|
||||
int fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) {
|
||||
int ret = cTg_InsertToTree(&i_layer->node_tree, i_treeListNo, i_createTag, i_no);
|
||||
return ret;
|
||||
}
|
||||
|
||||
s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) {
|
||||
int fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) {
|
||||
int ret = cTg_AdditionToTree(&i_layer->node_tree, i_treeListNo, i_createTag);
|
||||
return ret;
|
||||
}
|
||||
|
||||
s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
|
||||
int fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
|
||||
UNUSED(i_layer);
|
||||
|
||||
int ret = cTg_SingleCutFromTree(i_createTag);
|
||||
@@ -132,7 +132,7 @@ void fpcLy_Regist(layer_class* i_layer) {
|
||||
cLs_Addition(&l_fpcLy_LayerList, (node_class*)i_layer);
|
||||
}
|
||||
|
||||
s32 fpcLy_Delete(layer_class* i_layer) {
|
||||
int fpcLy_Delete(layer_class* i_layer) {
|
||||
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;
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
#include "SSystem/SComponent/c_tree_iter.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
|
||||
int fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
|
||||
layer_iter iter;
|
||||
iter.func = (void*)i_func;
|
||||
iter.data = i_data;
|
||||
return cTrIt_Method(&i_layer->node_tree, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter);
|
||||
}
|
||||
|
||||
s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
|
||||
s32 result;
|
||||
int fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
|
||||
int result;
|
||||
layer_class* save_layer = fpcLy_CurrentLayer();
|
||||
|
||||
fpcLy_SetCurrentLayer(i_layer);
|
||||
@@ -26,7 +26,7 @@ s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void*
|
||||
return result;
|
||||
}
|
||||
|
||||
s32 fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
|
||||
int fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
|
||||
int ret = 1;
|
||||
|
||||
layer_iter iter;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "f_pc/f_pc_layer_tag.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
|
||||
int fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
|
||||
u16 i_listPriority) {
|
||||
if (i_layer_tag->layer == NULL && i_layerID == fpcLy_NONE_e) {
|
||||
return 0;
|
||||
@@ -17,7 +17,7 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerI
|
||||
}
|
||||
|
||||
if (i_layerID == fpcLy_NONE_e || i_layerID == fpcLy_CURRENT_e) {
|
||||
s32 result = fpcLy_ToQueue(i_layer_tag->layer, i_listID, &i_layer_tag->create_tag);
|
||||
int result = fpcLy_ToQueue(i_layer_tag->layer, i_listID, &i_layer_tag->create_tag);
|
||||
if (result != 0) {
|
||||
i_layer_tag->node_list_id = i_listID;
|
||||
i_layer_tag->node_list_priority = result - 1;
|
||||
@@ -34,7 +34,7 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerI
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
|
||||
int fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
|
||||
if (fpcLy_QueueTo(i_layer_tag->layer, &i_layer_tag->create_tag) == 1) {
|
||||
i_layer_tag->layer = NULL;
|
||||
i_layer_tag->node_list_id = 0xFFFF;
|
||||
@@ -45,7 +45,7 @@ s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
|
||||
int fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
|
||||
u16 i_listPriority) {
|
||||
layer_class* layer = fpcLy_Layer(i_layerID);
|
||||
if (layer == NULL) {
|
||||
@@ -58,7 +58,7 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID,
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcLyTg_Init(layer_management_tag_class* i_layer_tag, fpc_ProcID i_id, void* i_data) {
|
||||
int fpcLyTg_Init(layer_management_tag_class* i_layer_tag, fpc_ProcID i_id, void* i_data) {
|
||||
static layer_management_tag_class crear = {
|
||||
NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF,
|
||||
};
|
||||
|
||||
+11
-9
@@ -10,18 +10,19 @@ s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) {
|
||||
return fpcDwPi_Get(&i_leaf->draw_priority);
|
||||
}
|
||||
|
||||
s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) {
|
||||
int fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) {
|
||||
return fpcMtd_Method(i_methods->draw_method, i_process);
|
||||
}
|
||||
|
||||
s32 fpcLf_Draw(leafdraw_class* i_leaf) {
|
||||
s32 ret = 0;
|
||||
if (i_leaf->unk_0xBC == 0)
|
||||
int fpcLf_Draw(leafdraw_class* i_leaf) {
|
||||
int ret = 0;
|
||||
if (i_leaf->unk_0xBC == 0) {
|
||||
ret = fpcLf_DrawMethod(i_leaf->leaf_methods, i_leaf);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
s32 fpcLf_Execute(leafdraw_class* i_leaf) {
|
||||
int fpcLf_Execute(leafdraw_class* i_leaf) {
|
||||
#if DEBUG
|
||||
if (fpcBs_Is_JustOfType(g_fpcLf_type, i_leaf->base.subtype) == 0) {
|
||||
if (g_fpcDbSv_service[12] != NULL) {
|
||||
@@ -33,12 +34,13 @@ s32 fpcLf_Execute(leafdraw_class* i_leaf) {
|
||||
return fpcMtd_Execute(&i_leaf->leaf_methods->base, i_leaf);
|
||||
}
|
||||
|
||||
s32 fpcLf_IsDelete(leafdraw_class* i_leaf) {
|
||||
int fpcLf_IsDelete(leafdraw_class* i_leaf) {
|
||||
return fpcMtd_IsDelete(&i_leaf->leaf_methods->base, i_leaf);
|
||||
}
|
||||
|
||||
s32 fpcLf_Delete(leafdraw_class* i_leaf) {
|
||||
s32 ret = fpcMtd_Delete(&i_leaf->leaf_methods->base, i_leaf);
|
||||
int fpcLf_Delete(leafdraw_class* i_leaf) {
|
||||
int ret = fpcMtd_Delete(&i_leaf->leaf_methods->base, i_leaf);
|
||||
UNUSED(ret); // possible fakematch? this line fixes debug regalloc
|
||||
if (ret == 1) {
|
||||
i_leaf->base.subtype = 0;
|
||||
}
|
||||
@@ -47,7 +49,7 @@ s32 fpcLf_Delete(leafdraw_class* i_leaf) {
|
||||
|
||||
int g_fpcLf_type;
|
||||
|
||||
s32 fpcLf_Create(leafdraw_class* i_leaf) {
|
||||
int fpcLf_Create(leafdraw_class* i_leaf) {
|
||||
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;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
static node_list_class l_fpcLn_Line[16];
|
||||
|
||||
void fpcLn_Create() {
|
||||
s32 i = ARRAY_SIZEU(l_fpcLn_Line);
|
||||
int i = ARRAY_SIZEU(l_fpcLn_Line);
|
||||
node_list_class* line_node = l_fpcLn_Line;
|
||||
while (i-- > 0)
|
||||
cLs_Create(line_node++);
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
#include "f_pc/f_pc_line.h"
|
||||
|
||||
|
||||
static s32 fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) {
|
||||
static int fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) {
|
||||
layer_class* layer = static_cast<base_process_class*>(i_createTag->mpTagData)->layer_tag.layer;
|
||||
layer_class* save_layer = fpcLy_CurrentLayer();
|
||||
s32 ret;
|
||||
int ret;
|
||||
|
||||
fpcLy_SetCurrentLayer(layer);
|
||||
ret = cTgIt_MethodCall(i_createTag, i_filter);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "f_pc/f_pc_line.h"
|
||||
|
||||
|
||||
s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
|
||||
int fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
|
||||
if (i_lineTag->list_id != i_newListID) {
|
||||
fpcLnTg_QueueTo(i_lineTag);
|
||||
return fpcLnTg_ToQueue(i_lineTag, i_newListID);
|
||||
@@ -21,7 +21,7 @@ void fpcLnTg_QueueTo(line_tag* i_lineTag) {
|
||||
i_lineTag->list_id = -1;
|
||||
}
|
||||
|
||||
s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
|
||||
int fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
|
||||
if (cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->base)) {
|
||||
i_lineTag->list_id = lineListID;
|
||||
return 1;
|
||||
|
||||
@@ -21,7 +21,7 @@ void fpcLd_Free(s16 i_procName) {
|
||||
cDyl_Unlink((s16)i_procName);
|
||||
}
|
||||
|
||||
s32 fpcLd_Load(s16 i_procName) {
|
||||
int fpcLd_Load(s16 i_procName) {
|
||||
switch (cDyl_LinkASync((s16)i_procName)) {
|
||||
case cPhs_COMPLEATE_e:
|
||||
return cPhs_COMPLEATE_e;
|
||||
|
||||
+30
-10
@@ -5,9 +5,13 @@
|
||||
|
||||
#include "f_pc/f_pc_manager.h"
|
||||
#include "SSystem/SComponent/c_API_graphic.h"
|
||||
#include "SSystem/SComponent/c_lib.h"
|
||||
#include "Z2AudioLib/Z2SoundMgr.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/d_error_msg.h"
|
||||
#include "d/d_lib.h"
|
||||
#include "f_op/f_op_scene.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "f_ap/f_ap_game.h"
|
||||
#include "f_pc/f_pc_creator.h"
|
||||
#include "f_pc/f_pc_deletor.h"
|
||||
#include "f_pc/f_pc_draw.h"
|
||||
@@ -15,22 +19,21 @@
|
||||
#include "f_pc/f_pc_line.h"
|
||||
#include "f_pc/f_pc_pause.h"
|
||||
#include "f_pc/f_pc_priority.h"
|
||||
#include "f_pc/f_pc_profile.h"
|
||||
#include "m_Do/m_Do_controller_pad.h"
|
||||
|
||||
void fpcM_Draw(void* i_proc) {
|
||||
fpcDw_Execute((base_process_class*)i_proc);
|
||||
}
|
||||
|
||||
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) {
|
||||
int fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) {
|
||||
return fpcLyIt_OnlyHere(fpcLy_RootLayer(), (fpcLyIt_OnlyHereFunc)i_drawIterFunc, NULL);
|
||||
}
|
||||
|
||||
s32 fpcM_Execute(void* i_proc) {
|
||||
int fpcM_Execute(void* i_proc) {
|
||||
return fpcEx_Execute((base_process_class*)i_proc);
|
||||
}
|
||||
|
||||
s32 fpcM_Delete(void* i_proc) {
|
||||
int fpcM_Delete(void* i_proc) {
|
||||
return fpcDt_Delete((base_process_class*)i_proc);
|
||||
}
|
||||
|
||||
@@ -40,7 +43,10 @@ BOOL fpcM_IsCreating(fpc_ProcID i_id) {
|
||||
|
||||
void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_postExecuteFn) {
|
||||
MtxInit();
|
||||
dComIfGd_peekZdata();
|
||||
if (!fapGm_HIO_c::isCaptureScreen()) {
|
||||
dComIfGd_peekZdata();
|
||||
}
|
||||
fapGm_HIO_c::executeCaptureScreen();
|
||||
|
||||
if (!dShutdownErrorMsg_c::execute()) {
|
||||
static bool l_dvdError = false;
|
||||
@@ -72,8 +78,12 @@ void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_p
|
||||
i_preExecuteFn();
|
||||
}
|
||||
|
||||
fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute);
|
||||
fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw);
|
||||
if (!fapGm_HIO_c::isCaptureScreen()) {
|
||||
fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute);
|
||||
}
|
||||
if (!fapGm_HIO_c::isCaptureScreen() || fapGm_HIO_c::getCaptureScreenDivH() != 1) {
|
||||
fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw);
|
||||
}
|
||||
|
||||
if (i_postExecuteFn != NULL) {
|
||||
i_postExecuteFn();
|
||||
@@ -83,7 +93,16 @@ void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_p
|
||||
} else if (!l_dvdError) {
|
||||
dLib_time_c::stopTime();
|
||||
Z2GetSoundMgr()->pauseAllGameSound(true);
|
||||
mDoCPd_c::stopMotorWaveHard(0);
|
||||
#if PLATFORM_GCN
|
||||
#define FPCM_MANAGEMENT_GAMEPAD_COUNT 1
|
||||
#elif PLATFORM_SHIELD && !DEBUG
|
||||
#define FPCM_MANAGEMENT_GAMEPAD_COUNT 0
|
||||
#else
|
||||
#define FPCM_MANAGEMENT_GAMEPAD_COUNT 4
|
||||
#endif
|
||||
for (u32 i = 0; i < FPCM_MANAGEMENT_GAMEPAD_COUNT; i++) {
|
||||
mDoCPd_c::stopMotorWaveHard(i);
|
||||
}
|
||||
l_dvdError = true;
|
||||
}
|
||||
}
|
||||
@@ -103,7 +122,7 @@ base_process_class* fpcM_FastCreate(s16 i_procname, FastCreateReqFunc i_createRe
|
||||
i_createData, i_append);
|
||||
}
|
||||
|
||||
s32 fpcM_IsPause(void* i_proc, u8 i_flag) {
|
||||
int fpcM_IsPause(void* i_proc, u8 i_flag) {
|
||||
return fpcPause_IsEnable((base_process_class*)i_proc, i_flag & 0xFF);
|
||||
}
|
||||
|
||||
@@ -127,3 +146,4 @@ void* fpcM_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, voi
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,25 +5,25 @@
|
||||
|
||||
#include "f_pc/f_pc_method.h"
|
||||
|
||||
s32 fpcMtd_Method(process_method_func i_method, void* i_process) {
|
||||
int fpcMtd_Method(process_method_func i_method, void* i_process) {
|
||||
if (i_method != NULL)
|
||||
return i_method(i_process);
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcMtd_Execute(process_method_class* i_methods, void* i_process) {
|
||||
int fpcMtd_Execute(process_method_class* i_methods, void* i_process) {
|
||||
return fpcMtd_Method(i_methods->execute_method, i_process);
|
||||
}
|
||||
|
||||
s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) {
|
||||
int fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) {
|
||||
return fpcMtd_Method(i_methods->is_delete_method, i_process);
|
||||
}
|
||||
|
||||
s32 fpcMtd_Delete(process_method_class* i_methods, void* i_process) {
|
||||
int fpcMtd_Delete(process_method_class* i_methods, void* i_process) {
|
||||
return fpcMtd_Method(i_methods->delete_method, i_process);
|
||||
}
|
||||
|
||||
s32 fpcMtd_Create(process_method_class* i_methods, void* i_process) {
|
||||
int fpcMtd_Create(process_method_class* i_methods, void* i_process) {
|
||||
return fpcMtd_Method(i_methods->create_method, i_process);
|
||||
}
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
#include "f_pc/f_pc_method_tag.h"
|
||||
|
||||
s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag) {
|
||||
int fpcMtdTg_Do(process_method_tag_class* i_methodTag) {
|
||||
return i_methodTag->method(i_methodTag->data);
|
||||
}
|
||||
|
||||
s32 fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag) {
|
||||
int fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag) {
|
||||
return cTg_Addition(i_nodelist, &i_methodTag->create_tag);
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag) {
|
||||
cTg_SingleCut(&i_methodTag->create_tag);
|
||||
}
|
||||
|
||||
s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data) {
|
||||
int fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data) {
|
||||
cTg_Create(&i_methodTag->create_tag, i_methodTag);
|
||||
i_methodTag->method = i_method;
|
||||
i_methodTag->data = i_data;
|
||||
|
||||
+25
-26
@@ -7,12 +7,12 @@
|
||||
#include "f_pc/f_pc_layer_iter.h"
|
||||
#include "f_pc/f_pc_debug_sv.h"
|
||||
|
||||
s32 fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
|
||||
int fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
|
||||
return fpcMtd_Method(i_method_class->draw_method, i_data);
|
||||
}
|
||||
|
||||
s32 fpcNd_Draw(process_node_class* i_procNode) {
|
||||
s32 ret = 0;
|
||||
int fpcNd_Draw(process_node_class* i_procNode) {
|
||||
int ret = 0;
|
||||
process_node_class* var_r28 = i_procNode;
|
||||
|
||||
if (i_procNode->unk_0x1A8 == 0) {
|
||||
@@ -25,8 +25,8 @@ s32 fpcNd_Draw(process_node_class* i_procNode) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
s32 fpcNd_Execute(process_node_class* i_procNode) {
|
||||
s32 ret = 0;
|
||||
int fpcNd_Execute(process_node_class* i_procNode) {
|
||||
int ret = 0;
|
||||
layer_class* save_layer = fpcLy_CurrentLayer();
|
||||
|
||||
#if DEBUG
|
||||
@@ -47,25 +47,24 @@ s32 fpcNd_Execute(process_node_class* i_procNode) {
|
||||
int g_fpcNd_type;
|
||||
|
||||
void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
|
||||
layer_class* layer;
|
||||
process_node_class* procnode = (process_node_class*)i_procNode;
|
||||
if (procnode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, procnode->base.subtype) != FALSE)
|
||||
if (i_procNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, ((process_node_class*)i_procNode)->base.subtype) != FALSE)
|
||||
{
|
||||
layer = &procnode->layer;
|
||||
layer_class* layer;
|
||||
layer = &((process_node_class*)i_procNode)->layer;
|
||||
if (fpcLy_IsCreatingMesg(layer) == FALSE) {
|
||||
return (process_node_class*)fpcLyIt_Judge(
|
||||
layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL);
|
||||
} else {
|
||||
return procnode;
|
||||
return i_procNode;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
BOOL g_fpcNd_IsCheckOfDeleteTiming = TRUE;
|
||||
|
||||
s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
|
||||
int fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
|
||||
if (g_fpcNd_IsCheckOfDeleteTiming == TRUE && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) {
|
||||
return 0;
|
||||
}
|
||||
@@ -73,11 +72,11 @@ s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcNd_IsDelete(process_node_class* i_procNode) {
|
||||
int fpcNd_IsDelete(process_node_class* i_procNode) {
|
||||
return fpcMtd_IsDelete(&i_procNode->nodedraw_method->base, i_procNode);
|
||||
}
|
||||
|
||||
s32 fpcNd_Delete(process_node_class* i_procNode) {
|
||||
int fpcNd_Delete(process_node_class* i_procNode) {
|
||||
if (!fpcLy_IsDeletingMesg(&i_procNode->layer) &&
|
||||
fpcMtd_Delete(&i_procNode->nodedraw_method->base, i_procNode) == 1)
|
||||
{
|
||||
@@ -88,22 +87,22 @@ s32 fpcNd_Delete(process_node_class* i_procNode) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcNd_Create(process_node_class* i_procNode) {
|
||||
process_node_class* procnode = (process_node_class*)i_procNode;
|
||||
int fpcNd_Create(process_node_class* i_procNode) {
|
||||
int ret;
|
||||
layer_class* save_layer;
|
||||
s32 ret;
|
||||
|
||||
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;
|
||||
fpcLy_Create(&procnode->layer, procnode, procnode->layer_nodelist, 16);
|
||||
procnode->unk_0x1A8 = 0;
|
||||
if (i_procNode->base.state.init_state == 0) {
|
||||
node_process_profile_definition* pprofile =
|
||||
(node_process_profile_definition*)i_procNode->base.profile;
|
||||
i_procNode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type);
|
||||
i_procNode->nodedraw_method =
|
||||
(nodedraw_method_class*)pprofile->sub_methods;
|
||||
fpcLy_Create(&i_procNode->layer, i_procNode, i_procNode->layer_nodelist, 16);
|
||||
i_procNode->unk_0x1A8 = 0;
|
||||
}
|
||||
|
||||
save_layer = fpcLy_CurrentLayer();
|
||||
fpcLy_SetCurrentLayer(&procnode->layer);
|
||||
ret = fpcMtd_Create(&procnode->nodedraw_method->base, procnode);
|
||||
fpcLy_SetCurrentLayer(&i_procNode->layer);
|
||||
ret = fpcMtd_Create(&i_procNode->nodedraw_method->base, i_procNode);
|
||||
fpcLy_SetCurrentLayer(save_layer);
|
||||
return ret;
|
||||
}
|
||||
|
||||
+19
-20
@@ -27,7 +27,7 @@ void fpcNdRq_ToRequestQ(node_create_request* i_request) {
|
||||
fpcLy_CreatingMesg(i_request->layer);
|
||||
}
|
||||
|
||||
s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) {
|
||||
int fpcNdRq_phase_IsCreated(node_create_request* i_request) {
|
||||
if (fpcCtRq_IsCreatingByID(i_request->creating_id) == TRUE) {
|
||||
#if DEBUG
|
||||
if (i_request->unk_0x64-- <= 0) {
|
||||
@@ -46,7 +46,7 @@ s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcNdRq_phase_Create(node_create_request* i_request) {
|
||||
int fpcNdRq_phase_Create(node_create_request* i_request) {
|
||||
i_request->creating_id =
|
||||
fpcSCtRq_Request(i_request->layer, i_request->name,
|
||||
(stdCreateFunc)i_request->create_req_methods->post_method, i_request,
|
||||
@@ -58,11 +58,11 @@ s32 fpcNdRq_phase_Create(node_create_request* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) {
|
||||
int fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
|
||||
int fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
|
||||
if (fpcDt_IsComplete() == FALSE) {
|
||||
#if DEBUG
|
||||
if (i_request->unk_0x68-- <= 0) {
|
||||
@@ -78,7 +78,7 @@ s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_phase_Delete(node_create_request* i_request) {
|
||||
int fpcNdRq_phase_Delete(node_create_request* i_request) {
|
||||
if (i_request->node_proc.node != NULL) {
|
||||
if (fpcDt_Delete(&i_request->node_proc.node->base) == 0) {
|
||||
return cPhs_INIT_e;
|
||||
@@ -89,16 +89,16 @@ s32 fpcNdRq_phase_Delete(node_create_request* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_DoPhase(node_create_request* i_request) {
|
||||
s32 result = cPhs_Handler(&i_request->phase_request, i_request->phase_handler, i_request);
|
||||
int fpcNdRq_DoPhase(node_create_request* i_request) {
|
||||
int result = cPhs_Handler(&i_request->phase_request, i_request->phase_handler, i_request);
|
||||
if (result == cPhs_NEXT_e) {
|
||||
return fpcNdRq_DoPhase(i_request);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_Execute(node_create_request* i_request) {
|
||||
s32 result = fpcNdRq_DoPhase(i_request);
|
||||
int fpcNdRq_Execute(node_create_request* i_request) {
|
||||
int result = fpcNdRq_DoPhase(i_request);
|
||||
switch (result) {
|
||||
case cPhs_INIT_e:
|
||||
case cPhs_LOADING_e:
|
||||
@@ -113,7 +113,7 @@ s32 fpcNdRq_Execute(node_create_request* i_request) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcNdRq_Delete(node_create_request* i_request) {
|
||||
int fpcNdRq_Delete(node_create_request* i_request) {
|
||||
fpcNdRq_RequestQTo(i_request);
|
||||
if (i_request->create_req_methods != NULL && i_request->create_req_methods->delete_method != NULL &&
|
||||
fpcMtd_Method(i_request->create_req_methods->delete_method, i_request) == 0)
|
||||
@@ -125,7 +125,7 @@ s32 fpcNdRq_Delete(node_create_request* i_request) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_Cancel(node_create_request* i_request) {
|
||||
int fpcNdRq_Cancel(node_create_request* i_request) {
|
||||
if (i_request->create_req_methods != NULL &&
|
||||
fpcMtd_Method(i_request->create_req_methods->cancel_method, i_request) == 0)
|
||||
{
|
||||
@@ -137,7 +137,7 @@ s32 fpcNdRq_Cancel(node_create_request* i_request) {
|
||||
|
||||
#define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL)
|
||||
|
||||
s32 fpcNdRq_Handler() {
|
||||
int fpcNdRq_Handler() {
|
||||
node_class* node = l_fpcNdRq_Queue.mpHead;
|
||||
|
||||
#if DEBUG
|
||||
@@ -170,8 +170,8 @@ s32 fpcNdRq_Handler() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
|
||||
fpc_ProcID id = i_procNode->base.id;
|
||||
int fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
|
||||
fpc_ProcID id = ((process_node_class*)i_procNode)->base.id;
|
||||
request_node_class* req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
|
||||
|
||||
while (req_node != NULL) {
|
||||
@@ -187,14 +187,13 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_IsIng(process_node_class* i_procNode) {
|
||||
int fpcNdRq_IsIng(process_node_class* i_procNode) {
|
||||
request_node_class* req_node;
|
||||
node_create_request* create_req;
|
||||
fpc_ProcID id = i_procNode->base.id;
|
||||
fpc_ProcID id = ((process_node_class*)i_procNode)->base.id;
|
||||
|
||||
req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
|
||||
while (req_node != NULL) {
|
||||
create_req = req_node->node_create_req;
|
||||
node_create_request* create_req = req_node->node_create_req;
|
||||
if (create_req->creating_id == id) {
|
||||
return 1;
|
||||
}
|
||||
@@ -328,7 +327,7 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType,
|
||||
return req;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
|
||||
int fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
|
||||
request_node_class* req_node;
|
||||
|
||||
req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
|
||||
@@ -348,6 +347,6 @@ s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
|
||||
int fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
|
||||
return fpcNdRq_ReChangeNode(i_requestID, i_procName, i_data);
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "f_pc/f_pc_node.h"
|
||||
#include "f_pc/f_pc_layer_iter.h"
|
||||
|
||||
s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) {
|
||||
int fpcPause_IsEnable(void* i_proc, u8 i_flag) {
|
||||
if ((((base_process_class*)i_proc)->pause_flag & i_flag) == i_flag) {
|
||||
return 1;
|
||||
} else {
|
||||
@@ -15,7 +15,7 @@ s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcPause_Enable(void* i_proc, u8 i_flag) {
|
||||
int fpcPause_Enable(void* i_proc, u8 i_flag) {
|
||||
((base_process_class*)i_proc)->pause_flag |= i_flag;
|
||||
|
||||
if (fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_proc)->subtype)) {
|
||||
@@ -25,7 +25,7 @@ s32 fpcPause_Enable(void* i_proc, u8 i_flag) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcPause_Disable(void* i_proc, u8 i_flag) {
|
||||
int fpcPause_Disable(void* i_proc, u8 i_flag) {
|
||||
u8 var_r31 = 0xFF - i_flag;
|
||||
((base_process_class*)i_proc)->pause_flag &= var_r31;
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) {
|
||||
int fpcPi_IsInQueue(process_priority_class* i_procPriority) {
|
||||
return cTg_IsUse(&i_procPriority->base);
|
||||
}
|
||||
|
||||
s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
|
||||
int fpcPi_QueueTo(process_priority_class* i_procPriority) {
|
||||
cTg_SingleCut(&i_procPriority->base);
|
||||
fpcLy_CancelQTo(&i_procPriority->method_tag);
|
||||
return 1;
|
||||
@@ -19,7 +19,7 @@ s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
|
||||
|
||||
static node_list_class l_fpcPi_Queue;
|
||||
|
||||
s32 fpcPi_ToQueue(process_priority_class* i_procPriority) {
|
||||
int fpcPi_ToQueue(process_priority_class* i_procPriority) {
|
||||
fpc_ProcID layer = i_procPriority->queue_info.layer_id;
|
||||
|
||||
if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->base)) {
|
||||
@@ -49,7 +49,7 @@ process_priority_class* fpcPi_GetFromQueue() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
s32 fpcPi_Delete(process_priority_class* i_procPriority) {
|
||||
int fpcPi_Delete(process_priority_class* i_procPriority) {
|
||||
static priority_id crear = {
|
||||
fpcLy_NONE_e,
|
||||
0xFFFF,
|
||||
@@ -61,14 +61,14 @@ s32 fpcPi_Delete(process_priority_class* i_procPriority) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
|
||||
int 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;
|
||||
}
|
||||
|
||||
s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
|
||||
int 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;
|
||||
|
||||
@@ -108,7 +108,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 fpcPi_Handler() {
|
||||
int fpcPi_Handler() {
|
||||
process_priority_class* i_procPriority;
|
||||
while (i_procPriority = fpcPi_GetFromQueue()) {
|
||||
base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
|
||||
@@ -128,7 +128,7 @@ s32 fpcPi_Handler() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID,
|
||||
int fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID,
|
||||
u16 i_priority) {
|
||||
if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority))
|
||||
return 0;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "f_pc/f_pc_debug_sv.h"
|
||||
#include <dolphin/dolphin.h>
|
||||
|
||||
s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
|
||||
int ret = fpcLd_Load(i_request->process_name);
|
||||
|
||||
switch (ret) {
|
||||
@@ -25,7 +25,7 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
|
||||
fpcLy_SetCurrentLayer(i_request->base.layer);
|
||||
i_request->base.process =
|
||||
fpcBs_Create(i_request->process_name, i_request->base.id, i_request->process_append);
|
||||
@@ -40,7 +40,7 @@ s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
|
||||
fpcLy_SetCurrentLayer(i_request->base.layer);
|
||||
int ret = fpcBs_SubCreate(i_request->base.process);
|
||||
|
||||
@@ -56,8 +56,9 @@ s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
|
||||
process_node_class* procNode = (process_node_class*)i_request->base.process;
|
||||
int fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
|
||||
process_node_class* procNode =
|
||||
(process_node_class*)((standard_create_request_class*)i_request)->base.process;
|
||||
if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.subtype) == TRUE) {
|
||||
if (fpcLy_IsCreatingMesg(&procNode->layer) == TRUE) {
|
||||
return cPhs_INIT_e;
|
||||
@@ -66,7 +67,7 @@ s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
|
||||
stdCreateFunc create_func = i_request->create_post_method;
|
||||
|
||||
if (create_func != NULL) {
|
||||
@@ -79,30 +80,31 @@ s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_phase_Done(standard_create_request_class* i_request) {
|
||||
return cPhs_NEXT_e;
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_Handler(standard_create_request_class* i_request) {
|
||||
s32 phase_state = cPhs_Do(&i_request->phase_request, i_request);
|
||||
int fpcSCtRq_Handler(standard_create_request_class* i_request) {
|
||||
int phase_state = cPhs_Do(&i_request->phase_request, i_request);
|
||||
|
||||
switch (phase_state) {
|
||||
case cPhs_NEXT_e:
|
||||
return fpcSCtRq_Handler(i_request);
|
||||
case cPhs_COMPLEATE_e:
|
||||
return cPhs_COMPLEATE_e;
|
||||
case cPhs_LOADING_e:
|
||||
case cPhs_INIT_e:
|
||||
case cPhs_UNK3_e:
|
||||
case cPhs_ERROR_e:
|
||||
default:
|
||||
return phase_state;
|
||||
}
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_Delete(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_Delete(standard_create_request_class* i_request) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
s32 fpcSCtRq_Cancel(standard_create_request_class* i_request) {
|
||||
int fpcSCtRq_Cancel(standard_create_request_class* i_request) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user