diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-30 16:05:46 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-30 16:43:48 -0800 |
| commit | 98b84ea0fa774aac34c4eb276e0fdcf3d432716b (patch) | |
| tree | 76aab77a5d20d8576e1a398b0556452c4b92d1f4 /src | |
| parent | b45b95c3bea399defb428da0ab9bc63d51fa8df8 (diff) | |
f_pc_draw_priority: Type fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/f_op/f_op_actor.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_camera.cpp | 7 | ||||
| -rw-r--r-- | src/f_pc/f_pc_draw_priority.cpp | 2 | ||||
| -rw-r--r-- | src/f_pc/f_pc_leaf.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index b5af90e1c7..dd29ee8828 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 773d521f4d..37f1bd7c84 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 bd5085dfb2..b87011f5a5 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 795ad16044..2602f0084c 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); } |