diff --git a/src/KingSystem/Resource/CMakeLists.txt b/src/KingSystem/Resource/CMakeLists.txt index 44f444ae..9434ae76 100644 --- a/src/KingSystem/Resource/CMakeLists.txt +++ b/src/KingSystem/Resource/CMakeLists.txt @@ -110,8 +110,6 @@ target_sources(uking PRIVATE resResourceMgrTask.h resSystem.cpp resSystem.h - resTaskRequest.cpp - resTaskRequest.h resTextureHandleList.cpp resTextureHandleList.h resTextureHandleMgr.cpp diff --git a/src/KingSystem/Resource/resControlTask.cpp b/src/KingSystem/Resource/resControlTask.cpp index bdade971..3cee95c5 100644 --- a/src/KingSystem/Resource/resControlTask.cpp +++ b/src/KingSystem/Resource/resControlTask.cpp @@ -1,6 +1,5 @@ #include "KingSystem/Resource/resControlTask.h" #include "KingSystem/Resource/resSystem.h" -#include "KingSystem/Resource/resTaskRequest.h" namespace ksys::res { @@ -9,7 +8,7 @@ ControlTask::ControlTask(sead::Heap* heap) : util::ManagedTask(heap) {} void ControlTask::onRun_() {} void ControlTask::prepareImpl_(util::TaskRequest* req_) { - auto* req = static_cast(req_); + auto* req = static_cast(req_); mData.mHasResLoadReq = req->mHasResLoadReq; mData.mPackResUnit = req->mPackResUnit; diff --git a/src/KingSystem/Resource/resControlTask.h b/src/KingSystem/Resource/resControlTask.h index 8bebc1fd..ddbf2a01 100644 --- a/src/KingSystem/Resource/resControlTask.h +++ b/src/KingSystem/Resource/resControlTask.h @@ -3,6 +3,7 @@ #include #include "KingSystem/Resource/resLoadRequest.h" #include "KingSystem/Utils/Thread/ManagedTask.h" +#include "KingSystem/Utils/Thread/Task.h" #include "KingSystem/Utils/Thread/TaskData.h" #include "KingSystem/Utils/Types.h" @@ -38,4 +39,17 @@ private: }; KSYS_CHECK_SIZE_NX150(ControlTask, 0x1f8); +class ControlTaskRequest : public util::TaskRequest { + SEAD_RTTI_OVERRIDE(ControlTaskRequest, util::TaskRequest) +public: + ControlTaskRequest() = default; + + bool mHasResLoadReq = false; + ResourceUnit* mPackResUnit = nullptr; + Handle* mResHandle = nullptr; + sead::FixedSafeString<128> mResPath; + LoadRequest mResLoadReq; +}; +KSYS_CHECK_SIZE_NX150(ControlTaskRequest, 0x180); + } // namespace ksys::res diff --git a/src/KingSystem/Resource/resTaskRequest.cpp b/src/KingSystem/Resource/resTaskRequest.cpp deleted file mode 100644 index 85d649d1..00000000 --- a/src/KingSystem/Resource/resTaskRequest.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "resTaskRequest.h" diff --git a/src/KingSystem/Resource/resTaskRequest.h b/src/KingSystem/Resource/resTaskRequest.h deleted file mode 100644 index f9925417..00000000 --- a/src/KingSystem/Resource/resTaskRequest.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "KingSystem/Resource/resLoadRequest.h" -#include "KingSystem/Utils/Thread/Task.h" -#include "KingSystem/Utils/Types.h" - -namespace ksys::res { - -class Handle; -class ResourceUnit; - -class TaskRequest : public util::TaskRequest { - SEAD_RTTI_OVERRIDE(TaskRequest, util::TaskRequest) -public: - TaskRequest() = default; - - bool mHasResLoadReq = false; - ResourceUnit* mPackResUnit = nullptr; - Handle* mResHandle = nullptr; - sead::FixedSafeString<128> mResPath; - LoadRequest mResLoadReq; -}; -KSYS_CHECK_SIZE_NX150(TaskRequest, 0x180); - -} // namespace ksys::res