From 88a0a9eb691a3c1925e9b5d185fb12550618e5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 5 Mar 2022 19:09:32 +0100 Subject: Use sead::OffsetList::robustRange() when possible to simplify iteration --- src/KingSystem/ActorSystem/actBaseProcMgr.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/KingSystem/ActorSystem/actBaseProcMgr.cpp') diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp index ecf03b66..9c8c59be 100644 --- a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp +++ b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp @@ -310,11 +310,10 @@ void BaseProcMgr::calc() { for (auto& proc : mProcUpdateStateList) proc.processStateUpdate(mCounter); - for (auto it = mProcUpdateStateList.robustBegin(), end = mProcUpdateStateList.robustEnd(); - it != end; ++it) { - it->afterUpdateState_(); - if (it->mStateFlags.isZero()) { - mProcUpdateStateList.erase(std::addressof(*it)); + for (auto& proc : mProcUpdateStateList.robustRange()) { + proc.afterUpdateState_(); + if (proc.mStateFlags.isZero()) { + mProcUpdateStateList.erase(&proc); } } -- cgit v1.2.3