diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-30 16:11:17 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-30 16:43:48 -0800 |
| commit | 6fec278add8d2014c08532075a2fe8ca45192e70 (patch) | |
| tree | 8fac4d9994537dc6524c381be8c1810d4ff78c36 | |
| parent | 98b84ea0fa774aac34c4eb276e0fdcf3d432716b (diff) | |
narrow
| -rw-r--r-- | src/f_op/f_op_actor.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_camera.cpp | 15 | ||||
| -rw-r--r-- | src/f_op/f_op_kankyo.cpp | 3 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index dd29ee8828..98adcda8ff 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -271,7 +271,7 @@ static int fopAc_Create(void* actor) { fopAc_ac_c* ac = (fopAc_ac_c*)actor; if (fpcM_IsFirstCreating(actor)) { - leaf_process_profile_definition* profile = fpcM_GetProfile(actor); + leaf_process_profile_definition* profile = (leaf_process_profile_definition*) fpcM_GetProfile(actor); ac->mAcType = fpcBs_MakeOfType(&g_fopAc_type); ac->mSubMtd = (profile_method_class*)profile->mBase.mMethods; diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index 37f1bd7c84..113c4b563d 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -58,7 +58,8 @@ static int fopCam_Create(void* i_actorP) { camera_class* camera = (camera_class*)i_actorP; if (fpcM_IsFirstCreating(i_actorP)) { - leaf_process_profile_definition* profile = fpcM_GetProfile(i_actorP); + // TODO: This should be camera_process_profile_definition + leaf_process_profile_definition* profile = (leaf_process_profile_definition*) fpcM_GetProfile(i_actorP); camera->mpMtd = profile->mMethods; fopDwTg_Init(&camera->mCreateTag, camera); @@ -80,10 +81,10 @@ static int fopCam_Create(void* i_actorP) { /* ############################################################################################## */ /* 803A3860-803A3878 -00001 0014+04 0/0 2/0 0/0 .data g_fopCam_Method */ -void* g_fopCam_Method[5] = { - fopCam_Create, - fopCam_Delete, - fopCam_Execute, - fopCam_IsDelete, - fopCam_Draw +leafdraw_method_class g_fopCam_Method = { + (process_method_func)fopCam_Create, + (process_method_func)fopCam_Delete, + (process_method_func)fopCam_Execute, + (process_method_func)fopCam_IsDelete, + (process_method_func)fopCam_Draw }; diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index cb76f4aece..e8b4f2b48a 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -88,7 +88,8 @@ static int fopKy_Create(void* param_0) { kankyo_class* env = (kankyo_class*)param_0; if (fpcM_IsFirstCreating(param_0)) { - leaf_process_profile_definition* profile = fpcM_GetProfile(param_0); + // TODO: This should be kankyo_process_profile_definition + leaf_process_profile_definition* profile = (leaf_process_profile_definition*) fpcM_GetProfile(param_0); env->field_0xc0 = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE); env->field_0xd8 = profile->mBase.mMethods; |