From 98b84ea0fa774aac34c4eb276e0fdcf3d432716b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 30 Dec 2022 16:05:46 -0800 Subject: [PATCH] f_pc_draw_priority: Type fix --- include/f_pc/f_pc_draw_priority.h | 2 +- include/f_pc/f_pc_leaf.h | 2 +- src/f_op/f_op_actor.cpp | 2 +- src/f_op/f_op_camera.cpp | 7 +++---- src/f_pc/f_pc_draw_priority.cpp | 2 +- src/f_pc/f_pc_leaf.cpp | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index 6acd5cba2ab..9608bd25d5d 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -8,7 +8,7 @@ typedef struct draw_priority_class { s16 mPriority; } 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_Init(draw_priority_class* pDwPi, s16 p); diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 05b85796ab4..8234187ad38 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -30,7 +30,7 @@ typedef struct leaf_process_profile_definition { /* 0x3C */ leafdraw_method_class* mMethods; } 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_Draw(leafdraw_class* pMthd); s32 fpcLf_Execute(leafdraw_class* pLeaf); diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index b5af90e1c7c..dd29ee88281 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -340,7 +340,7 @@ static int fopAc_Create(void* actor) { int ret = fpcMtd_Create((process_method_class*)ac->mSubMtd, ac); if (ret == 4) { - s16 priority = fpcLf_GetPriority(ac); + s32 priority = fpcLf_GetPriority(ac); fopDwTg_ToDrawQ(&ac->mDwTg, priority); } else if (ret == 5) { fopAcM_OnCondition(ac, 0x10); diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index 773d521f4d7..37f1bd7c84f 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -70,10 +70,9 @@ static int fopCam_Create(void* i_actorP) { } int ret = fpcMtd_Create(&camera->mpMtd->mBase, camera); - - if (ret == 4) { - s16 prior = fpcLf_GetPriority(camera); - fopDwTg_ToDrawQ(&camera->mCreateTag, prior); + if (ret == cPhs_COMPLEATE_e) { + s32 priority = fpcLf_GetPriority(camera); + fopDwTg_ToDrawQ(&camera->mCreateTag, priority); } return ret; diff --git a/src/f_pc/f_pc_draw_priority.cpp b/src/f_pc/f_pc_draw_priority.cpp index bd5085dfb23..b87011f5a56 100644 --- a/src/f_pc/f_pc_draw_priority.cpp +++ b/src/f_pc/f_pc_draw_priority.cpp @@ -12,7 +12,7 @@ // /* 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; } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 795ad160448..2602f0084cb 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -12,7 +12,7 @@ // /* 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); }