mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-25 15:05:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

fopAcM_GetID

Browse Source
This commit is contained in:
Jasper St. Pierre
2026-02-28 14:22:56 -08:00
parent 17873f0a22
commit 5579fcabc3
12 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_mg_rod.cpp
+1 -1
View File
@@ -3297,7 +3297,7 @@ static void lure_main(dmg_rod_class* i_this) {
actor->speed.y = 0.0f;
}
dKy_Sound_set(actor->current.pos, 5, fopAcM_GetID(i_this), 5);
dKy_Sound_set(actor->current.pos, 5, fopAcM_GetID(actor), 5);
if (actor->speedF > 5.0f) {
actor->speedF = 5.0f;
}
src/d/actor/d_a_obj_bemos.cpp
+1 -1
View File
@@ -1161,7 +1161,7 @@ void daObjBm_c::Bgc_c::wall_pos(fopAc_ac_c const* i_actor, daObjBm_c::BgcSrc_c c
sp54 = sp48 + sp6C;
M_wall_work[i].Set(&sp48, &sp54, i_actor);
M_wall_work[i].SetActorPid(i_actor->base.base.id);
M_wall_work[i].SetActorPid(fopAcM_GetID(i_actor));
if (dComIfG_Bgsp().LineCross(&M_wall_work[i])) {
field_0x64[i] = M_wall_work[i].GetCross();
src/d/actor/d_a_obj_digsnow.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ void daObjDigSnow_c::mode_wait() {
void daObjDigSnow_c::mode_init_dig() {
dBgS_ObjGndChk obj_gnd_chk;
obj_gnd_chk.SetActorPid(base.base.id);
obj_gnd_chk.SetActorPid(fopAcM_GetID(this));
obj_gnd_chk.SetPos(&current.pos);
f32 gnd_height = dComIfG_Bgsp().GroundCross(&obj_gnd_chk);
src/d/actor/d_a_obj_gra2_soldier.inc
+2 -2
View File
@@ -898,7 +898,7 @@ int daObj_GrA_c::rollAttack(void* param_1) {
cXyz sp54(current.pos);
sp54.y += 100.0f;
field_0x1f4c.Set(&sp54, &player->eyePos, this);
field_0x1f4c.SetActorPid(base.base.id);
field_0x1f4c.SetActorPid(fopAcM_GetID(this));
s16 sVar1 = cLib_targetAngleX(&sp54, &player->eyePos);
if (isFirstGra() || !dComIfG_Bgsp().LineCross(&field_0x1f4c)) {
@@ -923,7 +923,7 @@ int daObj_GrA_c::rollAttack(void* param_1) {
cXyz sp60(current.pos);
sp60.y += 100.0f;
field_0x1f4c.Set(&sp60, &player->eyePos, this);
field_0x1f4c.SetActorPid(base.base.id);
field_0x1f4c.SetActorPid(fopAcM_GetID(this));
if (player->checkPlayerFly() == 0 && (player->current.pos.y - current.pos.y) > 50.0f) {
player->offGoronSideMove();
src/d/actor/d_a_obj_iceblock.cpp
+3 -3
View File
@@ -604,7 +604,7 @@ int daObjIceBlk_c::checkWallPre(s16 i_angle) {
int var_r29 = -1;
linchk.SetActorPid(base.base.id);
linchk.SetActorPid(fopAcM_GetID(this));
mDoMtx_stack_c::YrotS(i_angle);
mDoMtx_stack_c::multVec(&cXyz::BaseZ, &spBC);
@@ -639,7 +639,7 @@ int daObjIceBlk_c::checkBgHit() {
int var_r29 = -1;
mGndChk.SetActorPid(base.base.id);
mGndChk.SetActorPid(fopAcM_GetID(this));
for (int i = 0; i < 5; i++) {
static const Vec l_check_offsetXZ[] = {
@@ -703,7 +703,7 @@ BOOL daObjIceBlk_c::checkFall() {
cXyz end;
dBgS_ObjLinChk linchk;
linchk.SetActorPid(base.base.id);
linchk.SetActorPid(fopAcM_GetID(this));
for (int i = 0; i < 5; i++) {
static const Vec l_check_offsetXZ[] = {
src/d/actor/d_a_obj_ladder.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ int Act_c::Create() {
mDoMtx_stack_c::multVecZero(&gndVec);
mDoMtx_stack_c::pop();
mGndChk.SetPos(&gndVec);
mGndChk.SetActorPid(base.base.id);
mGndChk.SetActorPid(fopAcM_GetID(this));
mHeight = dComIfG_Bgsp().GroundCross(&mGndChk);
mInDemo = false;
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, prm_get_evId());
src/d/actor/d_a_obj_lv4chandelier.cpp
+1 -1
View File
@@ -429,7 +429,7 @@ void daObjLv4Chan_c::chkGnd() {
cStack_18 = field_0x23bc;
cStack_18.y += 300.0f;
mGndChk.SetPos(&cStack_18);
mGndChk.SetActorPid(base.base.id);
mGndChk.SetActorPid(fopAcM_GetID(this));
field_0x247c = dComIfG_Bgsp().GroundCross(&mGndChk);
}
src/d/actor/d_a_obj_lv4digsand.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ void daObjL4DigSand_c::mode_wait() {
void daObjL4DigSand_c::mode_init_dig() {
dBgS_ObjGndChk gndchk;
gndchk.SetActorPid(base.base.id);
gndchk.SetActorPid(fopAcM_GetID(this));
gndchk.SetPos(&current.pos);
f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk);
src/d/actor/d_a_obj_movebox.cpp
+3 -3
View File
@@ -154,7 +154,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.base.id);
M_gnd_work[i].SetActorPid(fopAcM_GetID(i_actor));
field_0x0[i] = dComIfG_Bgsp().GroundCross(&M_gnd_work[i]);
#if DEBUG
L_gnd_start[i_actor->mType][i].set(sp50);
@@ -234,7 +234,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.base.id);
M_wall_work[i].SetActorPid(fopAcM_GetID(i_actor));
#if DEBUG
L_wall_start[i_actor->mType][i].set(sp48);
L_wall_end[i_actor->mType][i].set(sp54);
@@ -338,7 +338,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.base.id);
touch_work.SetActorPid(fopAcM_GetID(i_actor));
#if DEBUG
if (field_0xA28 != g_Counter.mCounter0) {
src/d/actor/d_a_obj_pdtile.cpp
+1 -1
View File
@@ -421,7 +421,7 @@ int daObjPDtile_c::Execute(Mtx** param_1) {
-1.0f, 0);
}
dBgS_ObjGndChk adStack_e4;
adStack_e4.SetActorPid(base.base.id);
adStack_e4.SetActorPid(fopAcM_GetID(this));
adStack_e4.SetPos(&current.pos);
dComIfG_Bgsp().GroundCross(&adStack_e4);
if (home.pos.y - current.pos.y < -3000.0f) {
src/d/actor/d_a_obj_szbridge.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void daObjSZbridge_c::chkBg() {
chk_pos.y += 700.0f;
gnd_chk.SetPos(&chk_pos);
gnd_chk.SetActorPid(base.base.id);
gnd_chk.SetActorPid(fopAcM_GetID(this));
mGroundY = dComIfG_Bgsp().GroundCross(&gnd_chk);
chk_pos.y = mGroundY;
src/d/actor/d_a_tbox.cpp
+1 -1
View File
@@ -794,7 +794,7 @@ void daTbox_c::dropProc() {
dBgS_ObjGndChk gnd_chk;
gnd_chk.SetPos(&chkpos);
gnd_chk.SetActorPid(base.base.id);
gnd_chk.SetActorPid(fopAcM_GetID(this));
dComIfG_Bgsp().GroundCross(&gnd_chk);
int bg_index = gnd_chk.GetBgIndex();