From ceebb6f9c0a50429aacfd3f170918acd0a1914e2 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Fri, 28 Nov 2025 18:21:00 -0500 Subject: [PATCH] d_t_barrel linked --- config/SOUE01/rels/d_t_barrelNP/symbols.txt | 4 ++-- configure.py | 2 +- include/d/a/obj/d_a_obj_base.h | 2 ++ include/d/t/d_t_barrel.h | 5 +++-- include/d/t/d_tg.h | 2 ++ src/REL/d/t/d_t_barrel.cpp | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/config/SOUE01/rels/d_t_barrelNP/symbols.txt b/config/SOUE01/rels/d_t_barrelNP/symbols.txt index 3d27630f..74c10465 100644 --- a/config/SOUE01/rels/d_t_barrelNP/symbols.txt +++ b/config/SOUE01/rels/d_t_barrelNP/symbols.txt @@ -9,8 +9,8 @@ __dt__24sFState_c<11dTgBarrel_c>Fv = .text:0x00000250; // type:function size:0x5 __dt__27sFStateFct_c<11dTgBarrel_c>Fv = .text:0x000002B0; // type:function size:0x6C __dt__80sStateMgr_c<11dTgBarrel_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000320; // type:function size:0xA0 __dt__50sFStateMgr_c<11dTgBarrel_c,20sStateMethodUsr_FI_c>Fv = .text:0x000003C0; // type:function size:0xA4 -__ct__24dAcRef_c<12dAcOBarrel_c>Fv = .text:0x00000470; // type:function size:0x14 -__dt__24dAcRef_c<12dAcOBarrel_c>Fv = .text:0x00000490; // type:function size:0x58 +__ct__24dAcRef_c<12dAcObjBase_c>Fv = .text:0x00000470; // type:function size:0x14 +__dt__24dAcRef_c<12dAcObjBase_c>Fv = .text:0x00000490; // type:function size:0x58 __ct__26dAcRef_c<14dTgBarrelPos_c>Fv = .text:0x000004F0; // type:function size:0x14 __dt__26dAcRef_c<14dTgBarrelPos_c>Fv = .text:0x00000510; // type:function size:0x58 actorCreate__11dTgBarrel_cFv = .text:0x00000570; // type:function size:0xC0 diff --git a/configure.py b/configure.py index 3461bfd4..1961c7ff 100644 --- a/configure.py +++ b/configure.py @@ -2877,7 +2877,7 @@ config.libs = [ Rel(Matching, "d_t_action", "REL/d/t/d_t_action.cpp"), Rel(NonMatching, "d_t_at0", "REL/d/t/d_t_at0.cpp"), Rel(NonMatching, "d_t_auto_message", "REL/d/t/d_t_auto_message.cpp"), - Rel(NonMatching, "d_t_barrel", "REL/d/t/d_t_barrel.cpp"), + Rel(Matching, "d_t_barrel", "REL/d/t/d_t_barrel.cpp"), Rel(Matching, "d_t_barrel_pos", "REL/d/t/d_t_barrel_pos.cpp"), Rel(NonMatching, "d_t_bb_quake", "REL/d/t/d_t_bb_quake.cpp"), Rel(NonMatching, "d_t_bcal_tag", "REL/d/t/d_t_bcal_tag.cpp"), diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h index 039def40..1faa9589 100644 --- a/include/d/a/obj/d_a_obj_base.h +++ b/include/d/a/obj/d_a_obj_base.h @@ -264,4 +264,6 @@ public: /* 0x14 */ u8 _14[0x2C - 0x14]; }; +typedef dAcRef_c dAcObjRef_c; + #endif diff --git a/include/d/t/d_t_barrel.h b/include/d/t/d_t_barrel.h index 3266d6d1..19fb57e8 100644 --- a/include/d/t/d_t_barrel.h +++ b/include/d/t/d_t_barrel.h @@ -3,6 +3,7 @@ #include "common.h" #include "d/a/d_a_base.h" +#include "d/a/obj/d_a_obj_base.h" #include "d/t/d_tg.h" #include "m/m_vec.h" #include "s/s_State.hpp" @@ -29,9 +30,9 @@ public: private: /* 0x0FC */ STATE_MGR_DECLARE(dTgBarrel_c); - /* 0x138 */ dAcRef_c mStageRef; + /* 0x138 */ dAcObjRef_c mStageRef; /* 0x144 */ dAcRef_c mTgBarrelPosArr[10]; - /* 0x1BC */ dAcRef_c mBarrelArr[10]; + /* 0x1BC */ dAcObjRef_c mBarrelArr[10]; /* 0x234 */ mVec3_c mSpawnPosition; /* 0x240 */ u8 mStopFlag; ///< Stop Sceneflag - Note there is no checking done to see if valid /* 0x241 */ u8 mSpawnInterval; ///< Barrel Spawn Interval in Seconds diff --git a/include/d/t/d_tg.h b/include/d/t/d_tg.h index 4aa87822..a0cdf29d 100644 --- a/include/d/t/d_tg.h +++ b/include/d/t/d_tg.h @@ -8,4 +8,6 @@ public: virtual ~dTg_c() {} }; +typedef dAcRef_c dTgRef_c; + #endif diff --git a/src/REL/d/t/d_t_barrel.cpp b/src/REL/d/t/d_t_barrel.cpp index d6d81a89..f1c64bf4 100644 --- a/src/REL/d/t/d_t_barrel.cpp +++ b/src/REL/d/t/d_t_barrel.cpp @@ -84,7 +84,7 @@ void dTgBarrel_c::executeState_Wait() { mStateMgr.changeState(StateID_Stop); return; } - dAcOstageSink_c *pStage = mStageRef.get(); + dAcObjBase_c *pStage = mStageRef.get(); mVec3_c pos = pStage->mPosition; mAng3_c rot = pStage->mRotation;