From 2fef4f821eea3080017ae5229eb50b8daf020c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 9 May 2021 15:02:03 +0200 Subject: [PATCH] lib: Update sead --- lib/sead | 2 +- src/KingSystem/ActorSystem/actBaseProcJob.cpp | 4 ++-- src/KingSystem/Utils/Thread/TaskMgr.h | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/sead b/lib/sead index fb5b8c49..a60ec7d3 160000 --- a/lib/sead +++ b/lib/sead @@ -1 +1 @@ -Subproject commit fb5b8c490f2ae4393a43c972a69f9c3c11907915 +Subproject commit a60ec7d32c3d173bf1ff9629f721acc55ff7f9de diff --git a/src/KingSystem/ActorSystem/actBaseProcJob.cpp b/src/KingSystem/ActorSystem/actBaseProcJob.cpp index 1c64e5ee..71a969da 100644 --- a/src/KingSystem/ActorSystem/actBaseProcJob.cpp +++ b/src/KingSystem/ActorSystem/actBaseProcJob.cpp @@ -12,7 +12,7 @@ BaseProcJobLink::BaseProcJobLink(BaseProc* proc, u8 priority) sead::TListNode* BaseProcJobList::front() const { for (const auto& list : lists) { - if (list.size() >= 1 && list.front()) + if (list.front()) return list.front(); } return nullptr; @@ -23,7 +23,7 @@ sead::TListNode* BaseProcJobList::next(BaseProcJobLink* link) const { return next; for (int i = (link->getPriority2() >> 1) + 1; i < lists.size(); ++i) { - if (lists[i].size() >= 1 && lists[i].front()) + if (lists[i].front()) return lists[i].front(); } diff --git a/src/KingSystem/Utils/Thread/TaskMgr.h b/src/KingSystem/Utils/Thread/TaskMgr.h index a6cc2960..4c8fa131 100644 --- a/src/KingSystem/Utils/Thread/TaskMgr.h +++ b/src/KingSystem/Utils/Thread/TaskMgr.h @@ -50,9 +50,7 @@ public: void initAndCheckType(s32 num_tasks, sead::Heap* heap) { initImpl_(num_tasks, heap); if (hasTasks()) { - Task* task = nullptr; - if (mFreeTaskLists[0].size() >= 1) - task = mFreeTaskLists[0].front(); + Task* task = mFreeTaskLists[0].front(); const bool is_derived_from_managed_task = sead::IsDerivedFrom(task); SEAD_ASSERT(is_derived_from_managed_task); }