From c33d392f93d59a5d03b76c27a56c204ce91fa186 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sat, 15 Jun 2024 19:05:54 -0400 Subject: [PATCH] create d_a_t_wood_area header --- include/d/a/d_a_t_wood_area.h | 48 +++++++++++++++++++++++++++++++++ src/REL/d/a/d_a_t_wood_area.cpp | 44 ++---------------------------- 2 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 include/d/a/d_a_t_wood_area.h diff --git a/include/d/a/d_a_t_wood_area.h b/include/d/a/d_a_t_wood_area.h new file mode 100644 index 00000000..03576037 --- /dev/null +++ b/include/d/a/d_a_t_wood_area.h @@ -0,0 +1,48 @@ +#ifndef D_A_T_WOOD_AREA_H +#define D_A_T_WOOD_AREA_H + +#include +#include +#include +#include +#include + +class dAcTWoodArea_c : public dAcObjBase_c { +public: + dAcTWoodArea_c() : mStateMgr(*this, sStateID::null) {} + virtual ~dAcTWoodArea_c() {} + virtual int actorCreate() override; + virtual int actorPostCreate() override; + virtual int actorExecute() override; + virtual int draw() override; + virtual int doDelete() override; + + STATE_FUNC_DECLARE(dAcTWoodArea_c, Init); + STATE_FUNC_DECLARE(dAcTWoodArea_c, Wait); + + void attachCloseObjects(ProfileName profID); + void dropItems(); + bool attachObject(dAcObjBase_c *obj); + + f32 getAttachRadius() { + return scale.x * scaleX; + } + f32 getAttachRadiusSquare() { + return getAttachRadius() * getAttachRadius(); + } + f32 getAttachHeight() { + return scale.y * scaleY; + } + + static const f32 scaleX; + static const f32 scaleY; + +private: + STATE_MGR_DECLARE(dAcTWoodArea_c); + + dAcRef_c mRefs[8]; +}; + +// {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; + +#endif diff --git a/src/REL/d/a/d_a_t_wood_area.cpp b/src/REL/d/a/d_a_t_wood_area.cpp index 40009734..43921e3a 100644 --- a/src/REL/d/a/d_a_t_wood_area.cpp +++ b/src/REL/d/a/d_a_t_wood_area.cpp @@ -1,45 +1,4 @@ -#include -#include -#include -#include -#include - -class dAcTWoodArea_c : public dAcObjBase_c { -public: - dAcTWoodArea_c() : mStateMgr(*this, sStateID::null) {} - virtual ~dAcTWoodArea_c() {} - virtual int actorCreate() override; - virtual int actorPostCreate() override; - virtual int actorExecute() override; - virtual int draw() override; - virtual int doDelete() override; - - void attachCloseObjects(ProfileName profID); - void dropItems(); - bool attachObject(dAcObjBase_c *obj); - - f32 getAttachRadius() { - return scale.x * scaleX; - } - f32 getAttachRadiusSquare() { - return getAttachRadius() * getAttachRadius(); - } - - f32 getAttachHeight() { - return scale.y * scaleY; - } - - STATE_FUNC_DECLARE(dAcTWoodArea_c, Init); - STATE_FUNC_DECLARE(dAcTWoodArea_c, Wait); - - static const f32 scaleX; - static const f32 scaleY; - -private: - STATE_MGR_DECLARE(dAcTWoodArea_c); - - dAcRef_c mRefs[8]; -}; +#include const f32 dAcTWoodArea_c::scaleX = 100.0f; const f32 dAcTWoodArea_c::scaleY = 100.0f; @@ -95,6 +54,7 @@ extern "C" void fn_800298B0(u16, mVec3_c *, mAng3_c *, u32, u32, u32, u32, u32); extern u16 PARTICLE_RESOURCE_ID_MAPPING[]; void dAcTWoodArea_c::initializeState_Wait() {} + void dAcTWoodArea_c::executeState_Wait() { if (dPlayer::LINK != nullptr && (dPlayer::LINK->someFlags & 0x2000)) { // This is a bit messed up