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

Match f_op_scene, fix profile structs

Browse Source
This commit is contained in:
Jasper St. Pierre
2022-12-30 16:43:15 -08:00
parent 42b7a3f29e
commit 081bb1d745
26 changed files with 108 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_pc/f_pc_base.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pD
procClass->mBsType = fpcBs_MakeOfType(&g_fpcBs_type);
procClass->mProcName = procProfDef->mProcName;
fpcPause_Init(procClass);
procClass->mpPcMtd = procProfDef->mpPcMtd;
procClass->mpPcMtd = procProfDef->mSubMtd;
procClass->mpProf = procProfDef;
procClass->mpUserData = pData;
procClass->mParameters = procProfDef->mParameters;
src/f_pc/f_pc_draw.cpp
+2 -2
View File
@@ -22,9 +22,9 @@ s32 fpcDw_Execute(base_process_class* pProc) {
process_method_func func;
curLay = fpcLy_CurrentLayer();
if (fpcBs_Is_JustOfType(g_fpcLf_type, pProc->mSubType)) {
func = ((nodedraw_method_class*)pProc->mpPcMtd)->mNodedrawFunc;
func = ((leafdraw_method_class*)pProc->mpPcMtd)->mpDrawFunc;
} else {
func = ((nodedraw_method_class*)pProc->mpPcMtd)->mNodedrawFunc;
func = ((nodedraw_method_class*)pProc->mpPcMtd)->mpDrawFunc;
}
fpcLy_SetCurrentLayer(pProc->mLyTg.mpLayer);
ret = func(pProc);
src/f_pc/f_pc_leaf.cpp
+3 -3
View File
@@ -55,10 +55,10 @@ 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* pLeaf) {
process_profile_definition* profDef;
leaf_process_profile_definition* profDef;
if (pLeaf->mBase.mInitState == 0) {
profDef = (process_profile_definition*)pLeaf->mBase.mpProf;
pLeaf->mpDrawMtd = profDef->mLfDrwMth;
profDef = (leaf_process_profile_definition*)pLeaf->mBase.mpProf;
pLeaf->mpDrawMtd = profDef->mSubMtd;
pLeaf->mBase.mSubType = fpcBs_MakeOfType(&g_fpcLf_type);
fpcDwPi_Init(&pLeaf->mDwPi, profDef->mPriority);
pLeaf->mbUnk0 = 0;
src/f_pc/f_pc_node.cpp
+2 -2
View File
@@ -15,7 +15,7 @@
/* 800224F0-80022514 0024+00 s=1 e=1 z=0 None .text fpcNd_DrawMethod__FP21nodedraw_method_classPv
*/
s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData) {
return fpcMtd_Method(pNodeMethod->mNodedrawFunc, pData);
return fpcMtd_Method(pNodeMethod->mpDrawFunc, pData);
}
/* 80022514-80022580 006C+00 s=1 e=0 z=0 None .text fpcNd_Draw__FP18process_node_class */
@@ -104,7 +104,7 @@ s32 fpcNd_Create(process_node_class* pProcNode1) {
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->mBase.mLfDrwMth;
pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->mSubMtd;
fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10);
pProcNode->mUnk0 = 0;
}