mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 18:11:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'optimize_add_item' into 'master'

Browse source 
Optimize ContainerStore::stacks (attempt #2)

See merge request OpenMW/openmw!1200
This commit is contained in:
psi29a 2021-09-07 08:40:02 +00:00
commit aef6ec464c
8 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwlua/actions.cpp
View file

@ -71,7 +71,7 @@ namespace MWLua
else else
{ {
const std::string& recordId = std::get<std::string>(item); const std::string& recordId = std::get<std::string>(item);
if (old_it != store.end() && *old_it->getCellRef().getRefIdPtr() == recordId) if (old_it != store.end() && old_it->getCellRef().getRefIdRef() == recordId)
return true; // already equipped return true; // already equipped
itemPtr = store.search(recordId); itemPtr = store.search(recordId);
if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0) if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0)

2
apps/openmw/mwlua/luamanagerimp.cpp
View file

@ -284,7 +284,7 @@ namespace MWLua
std::shared_ptr<LocalScripts> scripts; std::shared_ptr<LocalScripts> scripts;
// When loading a game, it can be called before LuaManager::setPlayer, // When loading a game, it can be called before LuaManager::setPlayer,
// so we can't just check ptr == mPlayer here. // so we can't just check ptr == mPlayer here.
if (*ptr.getCellRef().getRefIdPtr() == "player") if (ptr.getCellRef().getRefIdRef() == "player")
{ {
scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry())); scripts = std::make_shared<PlayerScripts>(&mLua, LObject(getId(ptr), mWorldView.getObjectRegistry()));
scripts->addPackage("openmw.ui", mUserInterfacePackage); scripts->addPackage("openmw.ui", mUserInterfacePackage);

6
apps/openmw/mwlua/object.cpp
View file

@ -51,13 +51,13 @@ namespace MWLua
bool isMarker(const MWWorld::Ptr& ptr) bool isMarker(const MWWorld::Ptr& ptr)
{ {
std::string_view id = *ptr.getCellRef().getRefIdPtr(); std::string_view id = ptr.getCellRef().getRefIdRef();
return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker"; return id == "prisonmarker" || id == "divinemarker" || id == "templemarker" || id == "northmarker";
} }
std::string_view getMWClassName(const MWWorld::Ptr& ptr) std::string_view getMWClassName(const MWWorld::Ptr& ptr)
{ {
if (*ptr.getCellRef().getRefIdPtr() == "player") if (ptr.getCellRef().getRefIdRef() == "player")
return "Player"; return "Player";
if (isMarker(ptr)) if (isMarker(ptr))
return "Marker"; return "Marker";
@ -71,7 +71,7 @@ namespace MWLua
res.append(" ("); res.append(" (");
res.append(getMWClassName(ptr)); res.append(getMWClassName(ptr));
res.append(", "); res.append(", ");
res.append(*ptr.getCellRef().getRefIdPtr()); res.append(ptr.getCellRef().getRefIdRef());
res.append(")"); res.append(")");
return res; return res;
} }

5
apps/openmw/mwworld/cellref.cpp
View file

@ -48,11 +48,6 @@ namespace MWWorld
return mCellRef.mRefID; return mCellRef.mRefID;
} }
const std::string* CellRef::getRefIdPtr() const
{
return &mCellRef.mRefID;
}
bool CellRef::getTeleport() const bool CellRef::getTeleport() const
{ {
return mCellRef.mTeleport; return mCellRef.mTeleport;

4
apps/openmw/mwworld/cellref.hpp
View file

@ -38,8 +38,8 @@ namespace MWWorld
// Id of object being referenced // Id of object being referenced
std::string getRefId() const; std::string getRefId() const;
// Pointer to ID of the object being referenced // Reference to ID of the object being referenced
const std::string* getRefIdPtr() const; const std::string& getRefIdRef() const { return mCellRef.mRefID; }
// For doors - true if this door teleports to somewhere else, false // For doors - true if this door teleports to somewhere else, false
// if it should open through animation. // if it should open through animation.

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

@ -36,7 +36,7 @@ namespace
} }
bool cont = cell.second.forEach([&] (MWWorld::Ptr ptr) bool cont = cell.second.forEach([&] (MWWorld::Ptr ptr)
{ {
if(*ptr.getCellRef().getRefIdPtr() == id) if (ptr.getCellRef().getRefIdRef() == id)
{ {
return visitor(ptr); return visitor(ptr);
} }

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

@ -181,7 +181,7 @@ namespace
{ {
for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin()); for (typename MWWorld::CellRefList<T>::List::iterator iter (collection.mList.begin());
iter!=collection.mList.end(); ++iter) iter!=collection.mList.end(); ++iter)
if (iter->mRef.getRefNum()==state.mRef.mRefNum && *iter->mRef.getRefIdPtr() == state.mRef.mRefID) if (iter->mRef.getRefNum()==state.mRef.mRefNum && iter->mRef.getRefIdRef() == state.mRef.mRefID)
{ {
// overwrite existing reference // overwrite existing reference
float oldscale = iter->mRef.getScale(); float oldscale = iter->mRef.getScale();
@ -417,7 +417,7 @@ namespace MWWorld
const std::string *mIdToFind; const std::string *mIdToFind;
bool operator()(const PtrType& ptr) bool operator()(const PtrType& ptr)
{ {
if (*ptr.getCellRef().getRefIdPtr() == *mIdToFind) if (ptr.getCellRef().getRefIdRef() == *mIdToFind)
{ {
mFound = ptr; mFound = ptr;
return false; return false;

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

@ -184,7 +184,7 @@ int MWWorld::ContainerStore::count(const std::string &id) const
{ {
int total=0; int total=0;
for (const auto&& iter : *this) for (const auto&& iter : *this)
if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id)) if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefIdRef(), id))
total += iter.getRefData().getCount(); total += iter.getRefData().getCount();
return total; return total;
} }
@ -249,7 +249,7 @@ bool MWWorld::ContainerStore::stacks(const ConstPtr& ptr1, const ConstPtr& ptr2)
const MWWorld::Class& cls1 = ptr1.getClass(); const MWWorld::Class& cls1 = ptr1.getClass();
const MWWorld::Class& cls2 = ptr2.getClass(); const MWWorld::Class& cls2 = ptr2.getClass();
if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().getRefId(), ptr2.getCellRef().getRefId())) if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().getRefIdRef(), ptr2.getCellRef().getRefIdRef()))
return false; return false;
// If it has an enchantment, don't stack when some of the charge is already used // If it has an enchantment, don't stack when some of the charge is already used
@ -364,7 +364,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr,
for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter) for (MWWorld::ContainerStoreIterator iter (begin(type)); iter!=end(); ++iter)
{ {
if (Misc::StringUtils::ciEqual((*iter).getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId)) if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefIdRef(), MWWorld::ContainerStore::sGoldId))
{ {
iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), realCount)); iter->getRefData().setCount(addItems(iter->getRefData().getCount(false), realCount));
flagAsModified(); flagAsModified();
@ -465,7 +465,7 @@ int MWWorld::ContainerStore::remove(const std::string& itemId, int count, const
int toRemove = count; int toRemove = count;
for (ContainerStoreIterator iter(begin()); iter != end() && toRemove > 0; ++iter) for (ContainerStoreIterator iter(begin()); iter != end() && toRemove > 0; ++iter)
if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), itemId)) if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefIdRef(), itemId))
toRemove -= remove(*iter, toRemove, actor, equipReplacement, resolveFirst); toRemove -= remove(*iter, toRemove, actor, equipReplacement, resolveFirst);
flagAsModified(); flagAsModified();
@ -740,7 +740,7 @@ MWWorld::Ptr MWWorld::ContainerStore::findReplacement(const std::string& id)
for (auto&& iter : *this) for (auto&& iter : *this)
{ {
int iterHealth = iter.getClass().hasItemHealth(iter) ? iter.getClass().getItemHealth(iter) : 1; int iterHealth = iter.getClass().hasItemHealth(iter) ? iter.getClass().getItemHealth(iter) : 1;
if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefId(), id)) if (Misc::StringUtils::ciEqual(iter.getCellRef().getRefIdRef(), id))
{ {
// Prefer the stack with the lowest remaining uses // Prefer the stack with the lowest remaining uses
// Try to get item with zero durability only if there are no other items found // Try to get item with zero durability only if there are no other items found