From 22ba0a1cf0d90549685375568653bc0c5c92b5cb Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 7 May 2023 17:27:28 +0200 Subject: [PATCH] Improve variable names --- apps/openmw/mwworld/store.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp index b5b5d33026..6cdacdfc4a 100644 --- a/apps/openmw/mwworld/store.cpp +++ b/apps/openmw/mwworld/store.cpp @@ -687,21 +687,21 @@ namespace MWWorld for (const auto& movedRef : newMovedRefs) { // remove reference from current leased ref tracker and add it to new cell - auto itold = std::find(cell.mMovedRefs.begin(), cell.mMovedRefs.end(), movedRef.mRefNum); - if (itold != cell.mMovedRefs.end()) + auto itOld = std::find(cell.mMovedRefs.begin(), cell.mMovedRefs.end(), movedRef.mRefNum); + if (itOld != cell.mMovedRefs.end()) { - if (movedRef.mTarget[0] != itold->mTarget[0] || movedRef.mTarget[1] != itold->mTarget[1]) + if (movedRef.mTarget[0] != itOld->mTarget[0] || movedRef.mTarget[1] != itOld->mTarget[1]) { - ESM::Cell* wipecell = const_cast(search(itold->mTarget[0], itold->mTarget[1])); - auto it_lease = std::find_if(wipecell->mLeasedRefs.begin(), wipecell->mLeasedRefs.end(), + ESM::Cell* wipecell = const_cast(search(itOld->mTarget[0], itOld->mTarget[1])); + auto itLease = std::find_if(wipecell->mLeasedRefs.begin(), wipecell->mLeasedRefs.end(), ESM::CellRefTrackerPredicate(movedRef.mRefNum)); - if (it_lease != wipecell->mLeasedRefs.end()) - wipecell->mLeasedRefs.erase(it_lease); + if (itLease != wipecell->mLeasedRefs.end()) + wipecell->mLeasedRefs.erase(itLease); else Log(Debug::Error) << "Error: can't find " << movedRef.mRefNum.mIndex << " " << movedRef.mRefNum.mContentFile << " in leasedRefs"; } - *itold = movedRef; + *itOld = movedRef; } else cell.mMovedRefs.push_back(movedRef);