mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 15:29:55 +00:00
Move LiveCellRef where possible
This commit is contained in:
parent
f456978cc3
commit
ca8869042b
2 changed files with 5 additions and 5 deletions
|
@ -319,7 +319,7 @@ namespace
|
|||
// new reference
|
||||
MWWorld::LiveCellRef<T> ref(record);
|
||||
ref.load(state);
|
||||
collection.mList.push_back(ref);
|
||||
collection.mList.push_back(std::move(ref));
|
||||
|
||||
MWWorld::LiveCellRefBase* base = &collection.mList.back();
|
||||
MWBase::Environment::get().getWorldModel()->registerPtr(MWWorld::Ptr(base, cellstore));
|
||||
|
@ -426,9 +426,9 @@ namespace MWWorld
|
|||
liveCellRef.mData.setDeletedByContentFile(true);
|
||||
|
||||
if (iter != mList.end())
|
||||
*iter = liveCellRef;
|
||||
*iter = std::move(liveCellRef);
|
||||
else
|
||||
mList.push_back(liveCellRef);
|
||||
mList.push_back(std::move(liveCellRef));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -455,7 +455,7 @@ namespace MWWorld
|
|||
LiveCellRef<X> liveCellRef(ref, ptr);
|
||||
if (!isEnabled(ref, esmStore))
|
||||
liveCellRef.mData.disable();
|
||||
list.push_back(liveCellRef);
|
||||
list.push_back(std::move(liveCellRef));
|
||||
}
|
||||
|
||||
template <typename X>
|
||||
|
|
|
@ -103,7 +103,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::getState(
|
|||
|
||||
LiveCellRef<T> ref(record);
|
||||
ref.load(state);
|
||||
collection.mList.push_back(ref);
|
||||
collection.mList.push_back(std::move(ref));
|
||||
auto it = ContainerStoreIterator(this, --collection.mList.end());
|
||||
MWBase::Environment::get().getWorldModel()->registerPtr(*it);
|
||||
|
||||
|
|
Loading…
Reference in a new issue