diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-25 15:57:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-25 12:57:15 -0700 |
| commit | dbf6abeb90ee70aeec18695f7eb589a0977ddb56 (patch) | |
| tree | 2d5b78cf6535a71b679cc7abec6d2d6d5faf1e82 /src/d/actor/d_a_obj_movebox.cpp | |
| parent | 27507a603098d4cb88db0f6ec10b47336c092b2c (diff) | |
Use composition instead of inheritance for most f_op classes (#2700)
Diffstat (limited to 'src/d/actor/d_a_obj_movebox.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_movebox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 06ccd046c3..b928c1eefb 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -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); } |