diff --git a/src/KingSystem/ActorSystem/actBaseProcDeleter.h b/src/KingSystem/ActorSystem/actBaseProcDeleter.h index 9c48c07e..a46f5131 100644 --- a/src/KingSystem/ActorSystem/actBaseProcDeleter.h +++ b/src/KingSystem/ActorSystem/actBaseProcDeleter.h @@ -2,6 +2,7 @@ #include #include +#include "KingSystem/Utils/Thread/Task.h" #include "KingSystem/Utils/Types.h" namespace ksys::util { @@ -42,10 +43,9 @@ private: util::TaskMgr* mTaskMgr{}; util::TaskQueue* mTaskQueue{}; sead::Buffer mBuffer; - sead::Delegate1R mPreDeleteDelegate{ - this, &BaseProcDeleter::doPreDelete}; - sead::Delegate1R mUnloadActorParamDelegate{ - this, &BaseProcDeleter::doUnloadParam}; + util::TaskDelegateT mPreDeleteDelegate{this, &BaseProcDeleter::doPreDelete}; + util::TaskDelegateT mUnloadActorParamDelegate{this, + &BaseProcDeleter::doUnloadParam}; }; KSYS_CHECK_SIZE_NX150(BaseProcDeleter, 0x68); diff --git a/src/KingSystem/Utils/Thread/Task.h b/src/KingSystem/Utils/Thread/Task.h index 0df15083..2010ac77 100644 --- a/src/KingSystem/Utils/Thread/Task.h +++ b/src/KingSystem/Utils/Thread/Task.h @@ -51,6 +51,8 @@ public: KSYS_CHECK_SIZE_NX150(TaskRemoveCallbackContext, 0x18); using TaskDelegate = sead::IDelegate1R; +template +using TaskDelegateT = sead::Delegate1R; using TaskPostRunCallback = sead::IDelegate2; using TaskRemoveCallback = sead::IDelegate1;