Use composition instead of inheritance for most f_op classes (#2700)

This commit is contained in:
LagoLunatic
2025-09-25 15:57:15 -04:00
committed by GitHub
parent 27507a6030
commit dbf6abeb90
29 changed files with 62 additions and 55 deletions
+3 -3
View File
@@ -68,7 +68,7 @@ void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor,
mDoMtx_stack_c::multVec(&sp50, &sp5C);
M_gnd_work[i].SetPos(&sp5C);
M_gnd_work[i].SetActorPid(i_actor->base.id);
M_gnd_work[i].SetActorPid(i_actor->base.base.id);
field_0x0[i] = dComIfG_Bgsp().GroundCross(&M_gnd_work[i]);
if (field_0x0[i] > var_f31) {
@@ -149,7 +149,7 @@ void daObjMovebox::Bgc_c::wall_pos(daObjMovebox::Act_c const* i_actor,
sp54 = sp48 + sp6C;
M_wall_work[i].Set(&sp48, &sp54, i_actor);
M_wall_work[i].SetActorPid(i_actor->base.id);
M_wall_work[i].SetActorPid(i_actor->base.base.id);
if (dComIfG_Bgsp().LineCross(&M_wall_work[i])) {
field_0x64[i] = M_wall_work[i].GetCross();
@@ -252,7 +252,7 @@ bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor,
sp38 += i_actor->current.pos;
sp44 = sp38 + sp68;
touch_work.SetActorPid(i_actor->base.id);
touch_work.SetActorPid(i_actor->base.base.id);
touch_work.Set(&sp38, &sp44, i_actor);
return dComIfG_Bgsp().LineCross(&touch_work);
}