mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hashRefID' into 'master'

Browse Source 
Remove string copy in CellStore::search

See merge request OpenMW/openmw!77
This commit is contained in:
Andrei Kortunov 2019-04-24 16:46:13 +00:00
commit 28252bb359
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,10 +382,10 @@ namespace MWWorld
struct SearchVisitor
{
PtrType mFound;
std::string mIdToFind;
const std::string *mIdToFind;
bool operator()(const PtrType& ptr)
{
if (ptr.getCellRef().getRefId() == mIdToFind)
if (ptr.getCellRef().getRefId() == *mIdToFind)
{
mFound = ptr;
return false;
@ -397,7 +397,7 @@ namespace MWWorld
Ptr CellStore::search (const std::string& id)
{
SearchVisitor<MWWorld::Ptr> searchVisitor;
searchVisitor.mIdToFind = id;
searchVisitor.mIdToFind = &id;
forEach(searchVisitor);
return searchVisitor.mFound;
}
@ -405,7 +405,7 @@ namespace MWWorld
ConstPtr CellStore::searchConst (const std::string& id) const
{
SearchVisitor<MWWorld::ConstPtr> searchVisitor;
searchVisitor.mIdToFind = id;
searchVisitor.mIdToFind = &id;
forEachConst(searchVisitor);
return searchVisitor.mFound;
}