diff options
| author | Léo Lam <leo@leolam.fr> | 2022-02-27 12:48:28 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2022-02-27 12:50:52 +0100 |
| commit | df36d656650198b3cbf140e2982752a95b3f2c6d (patch) | |
| tree | 1af53905980b13aa03ab2f78dd548407370eb98c /src/KingSystem/ActorSystem/actBaseProcMgr.cpp | |
| parent | a5641860025aed373da045ef1ac43a6487529932 (diff) | |
Revert "Add #ifdef declarations for NON_MATCHING code"
This reverts commit 42807160cfb33af9f3cf2fa6b0ba98f232208cdb.
It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.
Diffstat (limited to 'src/KingSystem/ActorSystem/actBaseProcMgr.cpp')
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProcMgr.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp index 718ce4d3..ecf03b66 100644 --- a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp +++ b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp @@ -40,8 +40,7 @@ BaseProcMgr::~BaseProcMgr() { BaseProcHeapMgr::deleteInstance(); } -// mJobLists.allocBufferAssert - BaseProcJobLists ctor -#ifdef NON_MATCHING +// NON_MATCHING: mJobLists.allocBufferAssert - BaseProcJobLists ctor void BaseProcMgr::init(sead::Heap* heap, s32 num_job_types, u32 main_thread_id, u32 havok_thread_id1, u32 havok_thread_id2, const BaseProcInitializerArgs& initializer_args) { @@ -67,7 +66,6 @@ void BaseProcMgr::init(sead::Heap* heap, s32 num_job_types, u32 main_thread_id, BaseProcHeapMgr::createInstance(heap); BaseProcLinkDataMgr::createInstance(heap); } -#endif void BaseProcMgr::generateProcId(u32* id) { *id = mCreatedProcCounter.increment(); @@ -531,8 +529,7 @@ BaseProc* BaseProcMgr::getProc(const u32& id, BaseProcMgr::ProcFilters filters) return proc; } -// stack -#ifdef NON_MATCHING +// NON_MATCHING: stack void BaseProcMgr::forEachProc(sead::IDelegate1<BaseProc*>& callback, ProcFilters filters) { const auto lock = sead::makeScopedLock(mProcMapCS); @@ -545,7 +542,6 @@ void BaseProcMgr::forEachProc(sead::IDelegate1<BaseProc*>& callback, ProcFilters mProcMap.forEach(sead::Delegate1<ProcForEachContext, util::StrTreeMapNode*>( &context, &ProcForEachContext::forEach)); } -#endif void BaseProcMgr::forEachProc(const sead::SafeString& proc_name, sead::IDelegate1<BaseProc*>& callback, @@ -637,12 +633,12 @@ void BaseProcMgr::decrementUnk3() { --mUnk3; } +// NON_MATCHING: reorderings void BaseProcMgr::queueExtraJobPush(BaseProcJobLink* job_link) { getExtraJobs().pushBack(job_link); } -// ??? -#ifdef NON_MATCHING +// NON_MATCHING: ??? void BaseProcMgr::moveExtraJobsToOtherBuffer(JobType type) { const auto old_idx = mCurrentExtraJobArrayIdx; swapExtraJobArray(); @@ -651,7 +647,6 @@ void BaseProcMgr::moveExtraJobsToOtherBuffer(JobType type) { link.getProc()->queueExtraJobPush_(type, mCurrentExtraJobArrayIdx); } } -#endif bool BaseProcMgr::hasExtraJobLink(BaseProcJobLink* job_link, s32 idx) { for (auto& ptr : mExtraJobLinkArrays[idx]) { |