Revert "Implement overwriting pathgrid records"

This broke pathgrid loading in exterior cells due to an unexpected problem in the pathgrid record system (bug #2195).

This reverts commit dd0cea21b0.
moveref
scrawl 10 years ago
parent ddad963312
commit 04a68fc976

@ -876,36 +876,8 @@ namespace MWWorld
public:
void load(ESM::ESMReader &esm, const std::string &id) {
ESM::Pathgrid pathgrid;
pathgrid.load(esm);
// Try to overwrite existing record
// Can't use search() because we aren't sorted yet
if (!pathgrid.mCell.empty())
{
for (std::vector<ESM::Pathgrid>::iterator it = mStatic.begin(); it != mStatic.end(); ++it)
{
if ((*it).mCell == pathgrid.mCell)
{
(*it) = pathgrid;
return;
}
}
}
else
{
for (std::vector<ESM::Pathgrid>::iterator it = mStatic.begin(); it != mStatic.end(); ++it)
{
if ((*it).mData.mX == pathgrid.mData.mX && (*it).mData.mY == pathgrid.mData.mY)
{
(*it) = pathgrid;
return;
}
}
}
mStatic.push_back(pathgrid);
mStatic.push_back(ESM::Pathgrid());
mStatic.back().load(esm);
}
size_t getSize() const {

Loading…
Cancel
Save