mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-23 19:20:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix wasteful allocations in Store<Land>::search

Browse Source
This commit is contained in:
scrawl 2017-02-14 07:10:01 +01:00
parent 72c6b11cf8
commit a495b9b884
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwworld/store.cpp
View File

@ -38,6 +38,12 @@ namespace
} }
return x->mX < y->mX; return x->mX < y->mX;
} }
bool operator()(const ESM::Land *x, const std::pair<int, int>& y) {
if (x->mX == y.first) {
return x->mY < y.second;
}
return x->mX < y.first;
}
}; };
} }
@ -438,11 +444,10 @@ namespace MWWorld
} }
const ESM::Land *Store<ESM::Land>::search(int x, int y) const const ESM::Land *Store<ESM::Land>::search(int x, int y) const
{ {
ESM::Land land; std::pair<int, int> comp(x,y);
land.mX = x, land.mY = y;
std::vector<ESM::Land *>::const_iterator it = std::vector<ESM::Land *>::const_iterator it =
std::lower_bound(mStatic.begin(), mStatic.end(), &land, Compare()); std::lower_bound(mStatic.begin(), mStatic.end(), comp, Compare());
if (it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) { if (it != mStatic.end() && (*it)->mX == x && (*it)->mY == y) {
return *it; return *it;