From df36d656650198b3cbf140e2982752a95b3f2c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 27 Feb 2022 12:48:28 +0100 Subject: 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. --- src/KingSystem/ActorSystem/actBaseProc.cpp | 8 ++------ 1 file changed, 2 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 545618a2..528766d3 100644 --- a/src/KingSystem/ActorSystem/actBaseProc.cpp +++ b/src/KingSystem/ActorSystem/actBaseProc.cpp @@ -155,8 +155,7 @@ BaseProc::PreDeletePrepareResult BaseProc::prepareForPreDelete_() { return PreDeletePrepareResult::Done; } -// branching -#ifdef NON_MATCHING +// NON_MATCHING: branching bool BaseProc::startPreparingForPreDelete_() { if (mUpdateStateListNode.isLinked()) return false; @@ -164,7 +163,6 @@ bool BaseProc::startPreparingForPreDelete_() { return !mBaseProcLinkData || mBaseProcLinkData->refCount() <= 0 || BaseProcMgr::instance()->getUnk3() || tera::checkTeraSystemStatus(); } -#endif void BaseProc::destruct_(int should_destruct) { if (should_destruct == 1) { @@ -348,8 +346,7 @@ void BaseProc::jobInvoked(JobType type) { } } -// branching -#ifdef NON_MATCHING +// NON_MATCHING: branching bool BaseProc::processStateUpdate(u8 counter) { const bool delete_requested = mStateFlags.isOn(StateFlags::RequestDelete); const bool initialized = mFlags.isOn(Flags::Initialized); @@ -447,7 +444,6 @@ bool BaseProc::processStateUpdate(u8 counter) { mStateFlags = new_flags; return ret; } -#endif void BaseProc::processPreDelete() { if (!mFlags.isOn(Flags::Initialized)) -- cgit v1.2.3