mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 10:36:41 +00:00
Code Issues Releases Wiki Activity

Move LiveCellRef where possible

Browse source
This commit is contained in:
elsid 2024-06-15 00:27:25 +02:00
parent f456978cc3
commit ca8869042b
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwworld/cellstore.cpp
View file

@ -319,7 +319,7 @@ namespace
// new reference // new reference
MWWorld::LiveCellRef<T> ref(record); MWWorld::LiveCellRef<T> ref(record);
ref.load(state); ref.load(state);
collection.mList.push_back(ref); collection.mList.push_back(std::move(ref));
MWWorld::LiveCellRefBase* base = &collection.mList.back(); MWWorld::LiveCellRefBase* base = &collection.mList.back();
MWBase::Environment::get().getWorldModel()->registerPtr(MWWorld::Ptr(base, cellstore)); MWBase::Environment::get().getWorldModel()->registerPtr(MWWorld::Ptr(base, cellstore));
@ -426,9 +426,9 @@ namespace MWWorld
liveCellRef.mData.setDeletedByContentFile(true); liveCellRef.mData.setDeletedByContentFile(true);
if (iter != mList.end()) if (iter != mList.end())
*iter = liveCellRef; *iter = std::move(liveCellRef);
else else
mList.push_back(liveCellRef); mList.push_back(std::move(liveCellRef));
} }
else else
{ {
@ -455,7 +455,7 @@ namespace MWWorld
LiveCellRef<X> liveCellRef(ref, ptr); LiveCellRef<X> liveCellRef(ref, ptr);
if (!isEnabled(ref, esmStore)) if (!isEnabled(ref, esmStore))
liveCellRef.mData.disable(); liveCellRef.mData.disable();
list.push_back(liveCellRef); list.push_back(std::move(liveCellRef));
} }
template <typename X> template <typename X>

2
apps/openmw/mwworld/containerstore.cpp
View file

@ -103,7 +103,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::getState(
LiveCellRef<T> ref(record); LiveCellRef<T> ref(record);
ref.load(state); ref.load(state);
collection.mList.push_back(ref); collection.mList.push_back(std::move(ref));
auto it = ContainerStoreIterator(this, --collection.mList.end()); auto it = ContainerStoreIterator(this, --collection.mList.end());
MWBase::Environment::get().getWorldModel()->registerPtr(*it); MWBase::Environment::get().getWorldModel()->registerPtr(*it);