diff options
| author | robojumper <robojumper@gmail.com> | 2025-08-21 23:10:18 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-09-15 22:11:23 +0200 |
| commit | cbe298e99a8da9ff2ddd66a651c852d5eeca914e (patch) | |
| tree | 9343f8c8290e38ae55fd000ea598f94fb548090d /include/d/a/obj | |
| parent | a416cab97e7999f8d4fc590ac69b7f4d3efc1389 (diff) | |
d_a_salbage_obj OK
Diffstat (limited to 'include/d/a/obj')
| -rw-r--r-- | include/d/a/obj/d_a_obj_base.h | 4 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_pot_sal.h | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h index 2b0c75d8..1f950092 100644 --- a/include/d/a/obj/d_a_obj_base.h +++ b/include/d/a/obj/d_a_obj_base.h @@ -18,6 +18,8 @@ #include "m/m_vec.h" #include "m/types_m.h" +class SalbageRelated; + // Ghidra: ActorObjectBase // size: 0x330 @@ -52,7 +54,7 @@ public: /* 0x210 */ dLinkage_c mLinkage; /* 0x2B8 */ u32 mField_0x2B8; /* 0x2BC */ ActorLighting mLightingInfo; - /* 0x32C */ u32 mField_0x32C; + /* 0x32C */ SalbageRelated *mpSalbageRelated; public: mVec3_c &GetOldPosition() { diff --git a/include/d/a/obj/d_a_obj_pot_sal.h b/include/d/a/obj/d_a_obj_pot_sal.h index f9d6e50c..5a4a6e49 100644 --- a/include/d/a/obj/d_a_obj_pot_sal.h +++ b/include/d/a/obj/d_a_obj_pot_sal.h @@ -1,17 +1,18 @@ #ifndef D_A_OBJ_POT_SAL_H #define D_A_OBJ_POT_SAL_H -#include "d/a/obj/d_a_obj_base.h" +#include "d/a/d_a_salbage_obj.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dAcOpotSal_c : public dAcObjBase_c { +class dAcOpotSal_c : public dAcSalbageObj_c { public: - dAcOpotSal_c() : mStateMgr(*this, sStateID::null) {} + dAcOpotSal_c() {} virtual ~dAcOpotSal_c() {} + STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOpotSal_c, dAcSalbageObj_c, DemoThrow); + STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOpotSal_c, dAcSalbageObj_c, After); + private: - /* 0x??? */ STATE_MGR_DECLARE(dAcOpotSal_c); }; #endif |