falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

f_pc_draw_priority: Type fix

This commit is contained in:
Jasper St. Pierre 2022-12-30 16:05:46 -08:00
parent b45b95c3be
commit 98b84ea0fa
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/f_pc/f_pc_draw_priority.h
View File

@ -8,7 +8,7 @@ typedef struct draw_priority_class {
s16 mPriority; s16 mPriority;
} draw_priority_class; } draw_priority_class;
s32 fpcDwPi_Get(const draw_priority_class* pDwPi); s16 fpcDwPi_Get(const draw_priority_class* pDwPi);
void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p); void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p);
void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p); void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p);

2
include/f_pc/f_pc_leaf.h
View File

@ -30,7 +30,7 @@ typedef struct leaf_process_profile_definition {
/* 0x3C */ leafdraw_method_class* mMethods; /* 0x3C */ leafdraw_method_class* mMethods;
} leaf_process_profile_definition; } leaf_process_profile_definition;
s32 fpcLf_GetPriority(const leafdraw_class* pLeaf); s16 fpcLf_GetPriority(const leafdraw_class* pLeaf);
s32 fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData); s32 fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData);
s32 fpcLf_Draw(leafdraw_class* pMthd); s32 fpcLf_Draw(leafdraw_class* pMthd);
s32 fpcLf_Execute(leafdraw_class* pLeaf); s32 fpcLf_Execute(leafdraw_class* pLeaf);

2
src/f_op/f_op_actor.cpp
View File

@ -340,7 +340,7 @@ static int fopAc_Create(void* actor) {
int ret = fpcMtd_Create((process_method_class*)ac->mSubMtd, ac); int ret = fpcMtd_Create((process_method_class*)ac->mSubMtd, ac);
if (ret == 4) { if (ret == 4) {
s16 priority = fpcLf_GetPriority(ac); s32 priority = fpcLf_GetPriority(ac);
fopDwTg_ToDrawQ(&ac->mDwTg, priority); fopDwTg_ToDrawQ(&ac->mDwTg, priority);
} else if (ret == 5) { } else if (ret == 5) {
fopAcM_OnCondition(ac, 0x10); fopAcM_OnCondition(ac, 0x10);

7
src/f_op/f_op_camera.cpp
View File

@ -70,10 +70,9 @@ static int fopCam_Create(void* i_actorP) {
} }
int ret = fpcMtd_Create(&camera->mpMtd->mBase, camera); int ret = fpcMtd_Create(&camera->mpMtd->mBase, camera);
if (ret == cPhs_COMPLEATE_e) {
if (ret == 4) { s32 priority = fpcLf_GetPriority(camera);
s16 prior = fpcLf_GetPriority(camera); fopDwTg_ToDrawQ(&camera->mCreateTag, priority);
fopDwTg_ToDrawQ(&camera->mCreateTag, prior);
} }
return ret; return ret;

2
src/f_pc/f_pc_draw_priority.cpp
View File

@ -12,7 +12,7 @@
// //
/* 80021308-80021310 0008+00 s=0 e=1 z=0 None .text fpcDwPi_Get__FPC19draw_priority_class */ /* 80021308-80021310 0008+00 s=0 e=1 z=0 None .text fpcDwPi_Get__FPC19draw_priority_class */
s32 fpcDwPi_Get(const draw_priority_class* pDwPi) { s16 fpcDwPi_Get(const draw_priority_class* pDwPi) {
return pDwPi->mPriority; return pDwPi->mPriority;
} }

2
src/f_pc/f_pc_leaf.cpp
View File

@ -12,7 +12,7 @@
// //
/* 80021A00-80021A24 0024+00 s=0 e=4 z=2 None .text fpcLf_GetPriority__FPC14leafdraw_class */ /* 80021A00-80021A24 0024+00 s=0 e=4 z=2 None .text fpcLf_GetPriority__FPC14leafdraw_class */
s32 fpcLf_GetPriority(const leafdraw_class* pLeaf) { s16 fpcLf_GetPriority(const leafdraw_class* pLeaf) {
return fpcDwPi_Get(&pLeaf->mDwPi); return fpcDwPi_Get(&pLeaf->mDwPi);
} }