mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use composition instead of inheritance for most f_op classes

Browse Source
This commit is contained in:
LagoLunatic
2025-09-25 15:59:25 -04:00
parent 1a828e61ab
commit d89fe27888
26 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_movebox.cpp
+4 -4
View File
@@ -127,7 +127,7 @@ namespace daObjMovebox {
cXyz pos;
mDoMtx_stack_c::multVec(&offset, &pos);
M_gnd_work[i].SetPos(&pos);
M_gnd_work[i].SetActorPid(movebox->base.mBsPcId);
M_gnd_work[i].SetActorPid(movebox->base.base.mBsPcId);
mGroundY[i] = dComIfG_Bgsp()->GroundCross(&M_gnd_work[i]);
if (mGroundY[i] > maxGroundY) {
fopAc_ac_c* groundActor = dComIfG_Bgsp()->GetActorPointer(M_gnd_work[i]);
@@ -184,7 +184,7 @@ namespace daObjMovebox {
startPos += movebox->current.pos;
endPos = startPos + temp_20;
M_wall_work[i].Set(&startPos, &endPos, const_cast<Act_c*>(movebox));
M_wall_work[i].SetActorPid(movebox->base.mBsPcId);
M_wall_work[i].SetActorPid(movebox->base.base.mBsPcId);
if (dComIfG_Bgsp()->LineCross(&M_wall_work[i])) {
mWallPos[i] = M_wall_work[i].GetCross();
f32 dist_sq = startPos.abs2(mWallPos[i]);
@@ -273,7 +273,7 @@ namespace daObjMovebox {
startPos += movebox->current.pos;
endPos = startPos + direction;
touch_work.SetActorPid(movebox->base.mBsPcId);
touch_work.SetActorPid(movebox->base.base.mBsPcId);
touch_work.Set(&startPos, &endPos, const_cast<Act_c*>(movebox));
return dComIfG_Bgsp()->LineCross(&touch_work);
}
@@ -1732,7 +1732,7 @@ namespace daObjMovebox {
cXyz centerPos(current.pos.x, current.pos.y + 100.0f, current.pos.z);
dBgS_ObjGndChk gndChk;
gndChk.SetPos(&centerPos);
gndChk.SetActorPid(base.mBsPcId);
gndChk.SetActorPid(base.base.mBsPcId);
dComIfG_Bgsp()->GroundCross(&gndChk);
s32 bgIndex = gndChk.GetBgIndex();
s32 mtrlSndId = 0;