From 0e0a55048af35358e8a6ac18a57cc1fcfff6cc98 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 9 Oct 2023 15:42:59 -0400 Subject: [PATCH] d_bg_s chks: lin, spl grl, wtr OK --- configure.py | 6 +++--- include/d/d_bg_s_lin_chk.h | 2 +- include/d/d_bg_s_spl_grp_chk.h | 2 +- src/d/d_bg_s_lin_chk.cpp | 7 ++++--- src/d/d_bg_s_spl_grp_chk.cpp | 16 +++++++++++++--- src/d/d_bg_s_wtr_chk.cpp | 4 ++-- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/configure.py b/configure.py index b9bf3a346..39a92d1ad 100644 --- a/configure.py +++ b/configure.py @@ -383,10 +383,10 @@ config.libs = [ Object(NonMatching, "d/d_bg_s.cpp"), Object(NonMatching, "d/d_bg_s_acch.cpp"), Object(NonMatching, "d/d_bg_s_func.cpp"), - Object(NonMatching, "d/d_bg_s_lin_chk.cpp"), + Object(Matching, "d/d_bg_s_lin_chk.cpp"), Object(Matching, "d/d_bg_s_movebg_actor.cpp"), - Object(NonMatching, "d/d_bg_s_spl_grp_chk.cpp"), - Object(NonMatching, "d/d_bg_s_wtr_chk.cpp"), + Object(Matching, "d/d_bg_s_spl_grp_chk.cpp"), + Object(Matching, "d/d_bg_s_wtr_chk.cpp"), Object(NonMatching, "d/d_bg_w.cpp"), Object(NonMatching, "d/d_bg_w_deform.cpp"), Object(NonMatching, "d/d_bg_w_hf.cpp"), diff --git a/include/d/d_bg_s_lin_chk.h b/include/d/d_bg_s_lin_chk.h index d4a339cde..38f30c7bd 100644 --- a/include/d/d_bg_s_lin_chk.h +++ b/include/d/d_bg_s_lin_chk.h @@ -12,7 +12,7 @@ public: SetPolyPassChk(GetPolyPassChkInfo()); SetGrpPassChk(GetGrpPassChkInfo()); } - void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c*); + void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c* pi_actor); virtual ~dBgS_LinChk() {} diff --git a/include/d/d_bg_s_spl_grp_chk.h b/include/d/d_bg_s_spl_grp_chk.h index 215a0c22e..520e3ee6a 100644 --- a/include/d/d_bg_s_spl_grp_chk.h +++ b/include/d/d_bg_s_spl_grp_chk.h @@ -13,7 +13,7 @@ public: /* 0x4 */ MOVE_BG_ONLY = 4 }; - dBgS_SplGrpChk() {} + dBgS_SplGrpChk(); void Init(); virtual ~dBgS_SplGrpChk() {} diff --git a/src/d/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp index 887e60922..ac692ad03 100644 --- a/src/d/d_bg_s_lin_chk.cpp +++ b/src/d/d_bg_s_lin_chk.cpp @@ -3,11 +3,12 @@ // Translation Unit: d_bg_s_lin_chk.cpp // -#include "d_bg_s_lin_chk.h" +#include "d/d_bg_s_lin_chk.h" +#include "f_op/f_op_actor_mng.h" #include "dolphin/types.h" /* 800A5678-800A56B8 .text Set__11dBgS_LinChkFP4cXyzP4cXyzP10fopAc_ac_c */ -void dBgS_LinChk::Set(cXyz*, cXyz*, fopAc_ac_c*) { - /* Nonmatching */ +void dBgS_LinChk::Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c* pi_actor) { + Set2(pi_start, pi_end, pi_actor ? fopAcM_GetID(pi_actor) : -1); } diff --git a/src/d/d_bg_s_spl_grp_chk.cpp b/src/d/d_bg_s_spl_grp_chk.cpp index f5d6a3b45..d425aff9a 100644 --- a/src/d/d_bg_s_spl_grp_chk.cpp +++ b/src/d/d_bg_s_spl_grp_chk.cpp @@ -3,16 +3,26 @@ // Translation Unit: d_bg_s_spl_grp_chk.cpp // -#include "d_bg_s_spl_grp_chk.h" +#include "d/d_bg_s_spl_grp_chk.h" #include "dolphin/types.h" /* 800A5A7C-800A5B94 .text __ct__14dBgS_SplGrpChkFv */ dBgS_SplGrpChk::dBgS_SplGrpChk() { - /* Nonmatching */ + SetPolyPassChk(GetPolyPassChkInfo()); + SetGrpPassChk(GetGrpPassChkInfo()); + OffNormalGrp(); + m_ground.x = 0.0f; + m_ground.y = 0.0f; + m_ground.z = 0.0f; + m_roof = 1000000000.0f; + m_height = 0.0f; } /* 800A5B94-800A5BDC .text Init__14dBgS_SplGrpChkFv */ void dBgS_SplGrpChk::Init() { - /* Nonmatching */ + OffIn(); + OffFind(); + SetHeight(m_ground.y); + ClearPi(); } diff --git a/src/d/d_bg_s_wtr_chk.cpp b/src/d/d_bg_s_wtr_chk.cpp index 5365f3dbf..a5d0e1fa2 100644 --- a/src/d/d_bg_s_wtr_chk.cpp +++ b/src/d/d_bg_s_wtr_chk.cpp @@ -3,11 +3,11 @@ // Translation Unit: d_bg_s_wtr_chk.cpp // -#include "d_bg_s_wtr_chk.h" +#include "d/d_bg_s_wtr_chk.h" #include "dolphin/types.h" /* 800A5BDC-800A5C3C .text __ct__11dBgS_WtrChkFv */ dBgS_WtrChk::dBgS_WtrChk() { - /* Nonmatching */ + OnWaterGrp(); }