Use composition instead of inheritance for most f_op classes

6 files changed, 12 insertions, 12 deletions

diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index 5d14d8d3..239f5d23 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -299,7 +299,7 @@ cPhs_State fopAc_Create(void* pProc) {
 
     cPhs_State status = fpcMtd_Create((process_method_class*)actor->sub_method, actor);
     if (status == cPhs_COMPLEATE_e) {
-        s32 priority = fpcLf_GetPriority(actor);
+        s32 priority = fpcM_DrawPriority(actor);
         fopDwTg_ToDrawQ(&actor->draw_tag, priority);
     }
 
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index 945486f9..6f3b8647 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -66,7 +66,7 @@ cPhs_State fopCam_Create(void* pProc) {
 
     cPhs_State ret = fpcMtd_Create(&camera->mpMtd->base, camera);
     if (ret == cPhs_COMPLEATE_e) {
-        s32 priority = fpcLf_GetPriority(camera);
+        s32 priority = fpcM_DrawPriority(camera);
         fopDwTg_ToDrawQ(&camera->draw_tag, priority);
     }
 
diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp
index 1ef9a7e0..d755837f 100644
--- a/src/f_op/f_op_kankyo.cpp
+++ b/src/f_op/f_op_kankyo.cpp
@@ -82,7 +82,7 @@ static cPhs_State fopKy_Create(void* i_ky) {
 
     cPhs_State ret = fpcMtd_Create((process_method_class*)i_this->sub_method, i_this);
     if (ret == cPhs_COMPLEATE_e) {
-        s32 priority = fpcLf_GetPriority(i_this);
+        s32 priority = fpcM_DrawPriority(i_this);
         fopDwTg_ToDrawQ(&i_this->draw_tag, priority);
     }
 
diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp
index d01f458e..4bfcb476 100644
--- a/src/f_op/f_op_msg.cpp
+++ b/src/f_op/f_op_msg.cpp
@@ -72,7 +72,7 @@ cPhs_State fopMsg_Create(void* i_this) {
 
     cPhs_State status = fpcMtd_Create((process_method_class*)_this->sub_method, _this);
     if (status == cPhs_COMPLEATE_e) {
-        s32 priority = fpcLf_GetPriority(_this);
+        s32 priority = fpcM_DrawPriority(_this);
         fopDwTg_ToDrawQ(&_this->draw_tag, priority);
     }
 
diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp
index b4a75228..6053a1cb 100644
--- a/src/f_op/f_op_overlap_mng.cpp
+++ b/src/f_op/f_op_overlap_mng.cpp
@@ -51,7 +51,7 @@ BOOL fopOvlpM_IsPeek() {
 
 BOOL fopOvlpM_IsDone() {
     if (l_fopOvlpM_overlap[0] != NULL)
-        return cReq_Is_Done(l_fopOvlpM_overlap[0]);
+        return cReq_Is_Done(&l_fopOvlpM_overlap[0]->base);
     else
         return FALSE;
 }
@@ -76,7 +76,7 @@ static overlap_request_class l_fopOvlpM_Request;
 request_base_class* fopOvlpM_Request(s16 procName, u16 peekTime) {
     if (l_fopOvlpM_overlap[0] == NULL) {
         l_fopOvlpM_overlap[0] = fopOvlpReq_Request(&l_fopOvlpM_Request, procName, peekTime);
-        return l_fopOvlpM_overlap[0];
+        return &l_fopOvlpM_overlap[0]->base;
     }
 
     return NULL;
diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp
index 5f42befd..727a8aaf 100644
--- a/src/f_op/f_op_overlap_req.cpp
+++ b/src/f_op/f_op_overlap_req.cpp
@@ -25,7 +25,7 @@ static cPhs_State fopOvlpReq_phase_Done(overlap_request_class* i_this) {
 }
 
 static cPhs_State fopOvlpReq_phase_IsDone(overlap_request_class* i_this) {
-    cReq_Done(i_this);
+    cReq_Done(&i_this->base);
     if (i_this->mDelay-- <= 0)
         return cPhs_NEXT_e;
     else
@@ -45,7 +45,7 @@ static cPhs_State fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_this)
     if (i_this->mPeektime)
         i_this->mPeektime--;
 
-    if (i_this->flag2 == 2 && !i_this->mPeektime) {
+    if (i_this->base.flag2 == 2 && !i_this->mPeektime) {
         cReq_Command(&i_this->mpTask->mRq, 2);
         return cPhs_NEXT_e;
     }
@@ -56,7 +56,7 @@ static cPhs_State fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_this)
 
 static cPhs_State fopOvlpReq_phase_IsComplete(overlap_request_class* i_this) {
     if (cReq_Is_Done(&i_this->mpTask->mRq)) {
-        cReq_Done(i_this);
+        cReq_Done(&i_this->base);
         return cPhs_NEXT_e;
     }
 
@@ -99,7 +99,7 @@ overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_this, s16 pro
         return i_this;
     }
 
-    cReq_Command(i_this, 1);
+    cReq_Command(&i_this->base, 1);
     i_this->mProcName = procName;
     cPhs_Set(&i_this->mPhs, phaseMethod);
     fopOvlpReq_SetPeektime(i_this, peekTime);
@@ -148,9 +148,9 @@ void fopOvlpReq_SetPeektime(overlap_request_class* i_this, u16 peekTime) {
 }
 
 BOOL fopOvlpReq_OverlapClr(overlap_request_class* i_this) {
-    if (i_this->flag0 == 1 || !fopOvlpReq_Is_PeektimeLimit(i_this))
+    if (i_this->base.flag0 == 1 || !fopOvlpReq_Is_PeektimeLimit(i_this))
         return FALSE;
 
-    cReq_Create(i_this, 2);
+    cReq_Create(&i_this->base, 2);
     return TRUE;
 }