diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2023-11-02 13:35:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 19:35:31 +0200 |
| commit | 30d9eaa052de1eda76bebfc88f679d6620b46160 (patch) | |
| tree | 22cb25b22a7cf015b706ae4fad79509a29a88008 /src | |
| parent | cfa5f44bb7884ed2842017329fa154453c2fd5ee (diff) | |
work on d_a_tbox (#1971)
* d_a_tag_evtarea mostly done, work on d_a_npc
* work on d_a_npc_ash
* work on Z2SoundHandles
* Z2SoundObject, JAUSoundAnimator OK
* Update Progress.md
* work on d_a_tbox
Diffstat (limited to 'src')
| -rw-r--r-- | src/d/a/d_a_alink.cpp | 1 | ||||
| -rw-r--r-- | src/d/a/d_a_player.cpp | 1 | ||||
| -rw-r--r-- | src/d/bg/d_bg_s_acch.cpp | 6 | ||||
| -rw-r--r-- | src/d/bg/d_bg_s_roof_chk.cpp | 2 | ||||
| -rw-r--r-- | src/d/bg/d_bg_s_sph_chk.cpp | 2 | ||||
| -rw-r--r-- | src/d/d_stage.cpp | 2 | ||||
| -rw-r--r-- | src/d/event/d_event.cpp | 1 | ||||
| -rw-r--r-- | src/d/msg/d_msg_flow.cpp | 1 |
8 files changed, 10 insertions, 6 deletions
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 9cec30fce6..0885adcd19 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -27,6 +27,7 @@ #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" #include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h" #include "rel/d/a/d_a_mirror/d_a_mirror.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" // // Types: diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index eb848ea391..d7b2d6dbcc 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -10,6 +10,7 @@ #include "d/a/d_a_alink.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" #include "rel/d/a/d_a_boomerang/d_a_boomerang.h" #include "rel/d/a/d_a_spinner/d_a_spinner.h" diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 476f7f0e2b..f70c5cda3e 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -277,7 +277,7 @@ void dBgS_Acch::Set(cXyz* p_pos, cXyz* p_old_pos, fopAc_ac_c* p_actor, int table pm_pos = p_pos; pm_old_pos = p_old_pos; m_my_ac = p_actor; - setActorPid(fopAcM_GetID(p_actor)); + SetActorPid(fopAcM_GetID(p_actor)); pm_speed = p_speed; m_tbl_size = table_size; field_0x8c = param_4; @@ -292,7 +292,7 @@ void dBgS_Acch::Set(fopAc_ac_c* p_actor, int table_size, dBgS_AcchCir* param_2) field_0x8c = param_2; m_my_ac = p_actor; - setActorPid(fopAcM_GetID(p_actor)); + SetActorPid(fopAcM_GetID(p_actor)); pm_pos = &fopAcM_GetPosition_p(p_actor); pm_old_pos = &fopAcM_GetOldPosition_p(p_actor); pm_speed = &fopAcM_GetSpeed_p(p_actor); @@ -335,7 +335,7 @@ void dBgS_Acch::GroundCheck(dBgS& param_0) { dBgS_RoofChk tmpRoofChk; data_80450F68 = 1; } - tmpRoofChk.setActorPid(m_gnd.GetActorPid()); + tmpRoofChk.SetActorPid(m_gnd.GetActorPid()); tmpRoofChk.i_SetPos(*pm_pos); f32 tmp = param_0.RoofChk(&tmpRoofChk); if (grnd_pos.y > tmp) { diff --git a/src/d/bg/d_bg_s_roof_chk.cpp b/src/d/bg/d_bg_s_roof_chk.cpp index 2a0387ec65..db13db1670 100644 --- a/src/d/bg/d_bg_s_roof_chk.cpp +++ b/src/d/bg/d_bg_s_roof_chk.cpp @@ -12,7 +12,7 @@ dBgS_RoofChk::dBgS_RoofChk() { m_pos.x = 0.0f; m_pos.y = 0.0f; m_pos.z = 0.0f; - setActorPid(0xFFFFFFFF); + SetActorPid(0xFFFFFFFF); field_0x48 = 0; } diff --git a/src/d/bg/d_bg_s_sph_chk.cpp b/src/d/bg/d_bg_s_sph_chk.cpp index e92a7e70d0..7c9671a17c 100644 --- a/src/d/bg/d_bg_s_sph_chk.cpp +++ b/src/d/bg/d_bg_s_sph_chk.cpp @@ -9,7 +9,7 @@ dBgS_SphChk::dBgS_SphChk() { SetPolyPassChk(GetPolyPassChkInfo()); SetGrpPassChk(GetGrpPassChkInfo()); - setActorPid(0xFFFFFFFF); + SetActorPid(0xFFFFFFFF); ClearPi(); mCallback = NULL; } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index c3d6f0d846..d74a80721d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1998,7 +1998,7 @@ static int dStage_playerInit(dStage_dt_c* stageDt, void* i_data, int num, void* static int dStage_cameraInit(dStage_dt_c* stageDt, void* i_data, int param_2, void* param_3) { stage_camera_class* camera = (stage_camera_class*)((char*)i_data + 4); stageDt->setCamera(camera); - dStage_cameraCreate(camera->field_0x4, 0, 0); + dStage_cameraCreate(camera->mEntries, 0, 0); return 1; } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index c163254836..792e350df2 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" #include "rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h" #include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h" diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 9fe27ed364..411417285d 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -14,6 +14,7 @@ #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" // // Forward References: |
