diff options
| author | Léo Lam <leo@leolam.fr> | 2020-08-22 10:25:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 10:25:31 +0200 |
| commit | 31e4ddd57285076b1fd5ddc4e309a74c6049be58 (patch) | |
| tree | 41d21965aaf463c0f9ad0331106dbae587424ed8 /src | |
| parent | fc306aa5f06ef1d28f6d178dff28d39b9056199a (diff) | |
| parent | da35629aa82c50ea26fc09006092ac7c340ca10c (diff) | |
Merge pull request #1 from notyouraveragehooman/master
BaseProc parent and child connections
Diffstat (limited to 'src')
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProc.cpp | 81 | ||||
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProc.h | 6 | ||||
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProcMgr.h | 7 |
3 files changed, 86 insertions, 8 deletions
diff --git a/src/KingSystem/ActorSystem/actBaseProc.cpp b/src/KingSystem/ActorSystem/actBaseProc.cpp index 149386e2..b0a94ed3 100644 --- a/src/KingSystem/ActorSystem/actBaseProc.cpp +++ b/src/KingSystem/ActorSystem/actBaseProc.cpp @@ -66,7 +66,7 @@ bool BaseProc::deleteLater(DeleteReason reason) { } } - if (!BaseProcMgr::instance()->addToUpdateStateList(*this)) + if (!BaseProcMgr::instance()->addToUpdateStateList(*this, StateFlags::RequestDelete)) onDeleteRequested_(reason); if (!is_high_prio) @@ -425,4 +425,83 @@ bool BaseProc::x00000071011ba9fc() { return true; } +void BaseProc::release() { + if (mRefCount >= 1) + mRefCount--; +} + +BaseProc* BaseProc::getConnectedCalcParent() const { + if (mConnectedCalcParent == nullptr || mConnectedCalcParent->mState == State::Delete) + return nullptr; + + return mConnectedCalcParent; +} + +bool BaseProc::setConnectedCalcParent(BaseProc* parent, bool delete_parent_on_delete) { + if (parent == nullptr) + return false; + + if (isDeletedOrDeleting() || parent->isDeletedOrDeleting()) + return false; + + if (BaseProcMgr::instance()->addToUpdateStateList(*this, StateFlags::RequestSetParent)) + return false; + + mConnectedCalcParentNew = parent; + + mFlags.change(Flags::DeleteParentOnDelete, delete_parent_on_delete); + + return true; +} + +void BaseProc::resetConnectedCalcParent(bool clear_existing_set_request) { + if (isDeletedOrDeleting()) + return; + + if (clear_existing_set_request) { + mStateFlags.reset(StateFlags::RequestSetParent); + mConnectedCalcParentNew = nullptr; + } + + if (mConnectedCalcParent) + BaseProcMgr::instance()->addToUpdateStateList(*this, StateFlags::RequestResetParent); +} + +BaseProc* BaseProc::getConnectedCalcChild() const { + if (!mConnectedCalcChild || mConnectedCalcChild->mState == State::Delete) + return nullptr; + + return mConnectedCalcChild; +} + +bool BaseProc::setConnectedCalcChild(BaseProc* child, bool delete_child_on_delete) { + if (child == nullptr) + return false; + + if (isDeletedOrDeleting() || child->isDeletedOrDeleting()) + return false; + + if (BaseProcMgr::instance()->addToUpdateStateList(*this, StateFlags::RequestSetChild)) + return false; + + mConnectedCalcChildNew = child; + + mFlags.change(Flags::DeleteChildOnDelete, delete_child_on_delete); + + return true; +} + +void BaseProc::resetConnectedCalcChild(bool clear_existing_set_request) { + if (isDeletedOrDeleting()) + return; + + if (clear_existing_set_request) { + mStateFlags.reset(StateFlags::RequestSetChild); + mConnectedCalcChildNew = nullptr; + } + + if (mConnectedCalcChild) + BaseProcMgr::instance()->addToUpdateStateList(*this, StateFlags::RequestResetChild); +} + } // namespace ksys::act diff --git a/src/KingSystem/ActorSystem/actBaseProc.h b/src/KingSystem/ActorSystem/actBaseProc.h index e0fde4c1..1c9aa7cc 100644 --- a/src/KingSystem/ActorSystem/actBaseProc.h +++ b/src/KingSystem/ActorSystem/actBaseProc.h @@ -107,11 +107,11 @@ public: void release(); BaseProc* getConnectedCalcParent() const; - void setConnectedCalcParent(BaseProc* parent, bool delete_parent_on_delete); + bool setConnectedCalcParent(BaseProc* parent, bool delete_parent_on_delete); void resetConnectedCalcParent(bool clear_existing_set_request); BaseProc* getConnectedCalcChild() const; - void setConnectedCalcChild(BaseProc* child, bool delete_child_on_delete); + bool setConnectedCalcChild(BaseProc* child, bool delete_child_on_delete); void resetConnectedCalcChild(bool clear_existing_set_request); bool isSpecialJobType(JobType type); @@ -282,7 +282,7 @@ protected: sead::ListNode mDeleteListNode; BaseProcMapNode mMapNode{this}; BaseProcUnit* mProcUnit = nullptr; - sead::Atomic<u32> mRefCount = 0; + sead::Atomic<s32> mRefCount = 0; private: void unlinkProcUnit_(); diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.h b/src/KingSystem/ActorSystem/actBaseProcMgr.h index 87fd4e19..9f278515 100644 --- a/src/KingSystem/ActorSystem/actBaseProcMgr.h +++ b/src/KingSystem/ActorSystem/actBaseProcMgr.h @@ -69,7 +69,7 @@ public: void unregisterProc(BaseProc& proc); void addToPreDeleteList(BaseProc& proc); - bool addToUpdateStateList(BaseProc& proc); + bool addToUpdateStateList(BaseProc& proc, BaseProc::StateFlags flags); void eraseFromPreDeleteList(BaseProc& proc); void eraseFromUpdateStateList(BaseProc& proc); void processPreDeleteList(); @@ -210,11 +210,10 @@ private: }; KSYS_CHECK_SIZE_NX150(BaseProcMgr, 0x21a0); -inline bool BaseProcMgr::addToUpdateStateList(BaseProc& proc) { +inline bool BaseProcMgr::addToUpdateStateList(BaseProc& proc, BaseProc::StateFlags flag) { auto lock = sead::makeScopedLock(mProcUpdateStateListCS); doAddToUpdateStateList_(proc); - return (proc.mStateFlags.set(BaseProc::StateFlags::RequestDelete) & - u32(BaseProc::StateFlags::RequestDelete)) != 0; + return (proc.mStateFlags.set(flag) & u32(flag)) != 0; } } // namespace ksys::act |
