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
This commit is contained in:
Caroline Madsen
2023-11-02 13:35:31 -04:00
committed by GitHub
parent cfa5f44bb7
commit 30d9eaa052
29 changed files with 2270 additions and 607 deletions
+1
View File
@@ -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:
+1
View File
@@ -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"
+3 -3
View File
@@ -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) {
+1 -1
View File
@@ -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;
}
+1 -1
View File
@@ -9,7 +9,7 @@
dBgS_SphChk::dBgS_SphChk() {
SetPolyPassChk(GetPolyPassChkInfo());
SetGrpPassChk(GetGrpPassChkInfo());
setActorPid(0xFFFFFFFF);
SetActorPid(0xFFFFFFFF);
ClearPi();
mCallback = NULL;
}
+1 -1
View File
@@ -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;
}
+1
View File
@@ -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"
+1
View File
@@ -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: