falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Private Acch fields

This commit is contained in:
LagoLunatic 2025-12-23 15:37:23 -05:00
parent 041231ac6e
commit 4dcee332a4
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/d/d_bg_s_acch.h
View File

@ -195,7 +195,7 @@ public:
f32 GetCx() const { return pm_pos->x; }
f32 GetCz() const { return pm_pos->z; }
public:
private:
/* 0x02C */ u32 m_flags;
/* 0x030 */ cXyz* pm_pos;
/* 0x034 */ cXyz* pm_old_pos;
@ -231,9 +231,11 @@ public:
/* 0x0E4 */ cXyz unk_0xe4;
#endif
/* 0x0D8 */ f32 field_0xd8;
public:
/* 0x0DC */ dBgS_GndChk m_gnd;
/* 0x130 */ dBgS_RoofChk m_roof;
/* 0x180 */ dBgS_WtrChk m_wtr;
private:
/* 0x1D4 */ u8 m_wtr_mode;
}; // Size: 0x1D8

4
src/d/actor/d_a_e_ms.cpp
View File

@ -67,7 +67,7 @@ static int daE_MS_Draw(e_ms_class* i_this) {
cXyz shadow_pos(i_this->current.pos.x, i_this->current.pos.y + 100.0f, i_this->current.pos.z);
i_this->mShadowKey =
dComIfGd_setShadow(i_this->mShadowKey, 1, model, &shadow_pos, 400.0f, 40.0f,
i_this->current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd,
i_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd,
&i_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
return 1;
@ -79,7 +79,7 @@ static void sibuki_set(e_ms_class* i_this) {
cXyz pos(i_this->current.pos);
pos.y = i_this->field_0x690;
fopKyM_createWpillar(&pos, 1.0f, 0);
if (i_this->field_0x690 - i_this->mAcch.m_ground_h > 50.0f) {
if (i_this->field_0x690 - i_this->mAcch.GetGroundH() > 50.0f) {
i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_S, 0, -1);
} else {
i_this->mSound.startCreatureSound(Z2SE_EN_MS_FALLWATER, 0, -1);

2
src/d/actor/d_a_mg_fish.cpp
View File

@ -673,7 +673,7 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) {
i_this->actor.current.pos.z);
i_this->mShadowId = dComIfGd_setShadow(i_this->mShadowId, 1, i_model, &pos,
600.0f * i_this->mJointScale, 0.0f,
i_this->actor.current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd,
i_this->actor.current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd,
&i_this->actor.tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj);
}
if (i_this->mKind2 == 3) {

2
src/d/actor/d_a_npc_shoe.cpp
View File

@ -158,7 +158,7 @@ cPhs__Step daNpcShoe_c::Create() {
mCcCyl.SetTgSPrm(0);
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.m_ground_h;
mGroundH = mAcch.GetGroundH();
gravity = mpHIO->m.common.gravity;
setEnvTevColor();

2
src/d/actor/d_a_npc_zant.cpp
View File

@ -105,7 +105,7 @@ int daNpc_Zant_c::create() {
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.m_ground_h;
mGroundH = mAcch.GetGroundH();
if (mGroundH != -G_CM3D_F_INF) {
setEnvTevColor();
setRoomNo();

2
src/d/actor/d_a_npc_zelR.cpp
View File

@ -148,7 +148,7 @@ int daNpc_ZelR_c::create() {
mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, &current.angle, &shape_angle);
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundH = mAcch.m_ground_h;
mGroundH = mAcch.GetGroundH();
setEnvTevColor();
setRoomNo();

4
src/d/actor/d_a_obj_stick.cpp
View File

@ -60,7 +60,7 @@ int daObj_Stick_c::create() {
mSph.SetStts(&mStts);
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundHeight = mAcch.m_ground_h;
mGroundHeight = mAcch.GetGroundH();
if(mGroundHeight != -G_CM3D_F_INF) {
setEnvTevColor();
@ -96,7 +96,7 @@ int daObj_Stick_c::Execute() {
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
mGroundHeight = mAcch.m_ground_h;
mGroundHeight = mAcch.GetGroundH();
if (mGroundHeight != -G_CM3D_F_INF) {
setEnvTevColor();
setRoomNo();