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/actBaseProc.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/actBaseProc.cpp')
| -rw-r--r-- | src/KingSystem/ActorSystem/actBaseProc.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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)) |