From 1e4f1902c05abbe57932f27e7469e91c74812ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 12 Mar 2021 01:17:24 +0100 Subject: ksys/act: Fix pre-delete function signature Tiny differences you only notice when doing matching decomp. --- src/KingSystem/ActorSystem/actBaseProc.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/KingSystem/ActorSystem/actBaseProc.cpp') diff --git a/src/KingSystem/ActorSystem/actBaseProc.cpp b/src/KingSystem/ActorSystem/actBaseProc.cpp index 6e1bea55..4342a9d9 100644 --- a/src/KingSystem/ActorSystem/actBaseProc.cpp +++ b/src/KingSystem/ActorSystem/actBaseProc.cpp @@ -189,7 +189,7 @@ void BaseProc::onEnterDelete_() {} void BaseProc::onEnterSleep_() {} -void BaseProc::preDelete3_(bool*) {} +void BaseProc::preDelete3_(const PreDeleteArg& arg) {} bool BaseProc::prepareInit_(sead::Heap*, BaseProc::PrepareArg&) { return true; @@ -197,7 +197,7 @@ bool BaseProc::prepareInit_(sead::Heap*, BaseProc::PrepareArg&) { void BaseProc::onPreDeleteStart_(PrepareArg&) {} -void BaseProc::preDelete2_(bool*) {} +void BaseProc::preDelete2_(const PreDeleteArg& arg) {} void BaseProc::preDelete1_() {} @@ -475,12 +475,12 @@ void BaseProc::freeLinkData() { BaseProcLinkDataMgr::instance()->releaseLink(this); } -void BaseProc::doPreDelete(bool* do_not_destruct_immediately) { +void BaseProc::doPreDelete(const PreDeleteArg& arg) { preDelete1_(); - preDelete2_(do_not_destruct_immediately); - preDelete3_(do_not_destruct_immediately); + preDelete2_(arg); + preDelete3_(arg); - if (*do_not_destruct_immediately) + if (arg.do_not_destruct_immediately) return; mFlags.set(Flags::Destructed); -- cgit v1.2.3