mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 15:09:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'this_is_not_the_iterator_you_are_looking_for' into 'master'

Browse source 
fix 

Closes 

See merge request
This commit is contained in:
elsid 2021-08-31 19:15:43 +00:00
commit 291195872e
1 changed files with 4 additions and 6 deletions

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

@ -742,14 +742,12 @@ namespace MWWorld
{
loadingListener->setLabel("Testing exterior cells ("+std::to_string(i)+"/"+std::to_string(cells.getExtSize())+")...");
CellStoreCollection::iterator iter = mActiveCells.begin();
CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
loadInactiveCell (cell, loadingListener, true);
activateCell (cell, loadingListener, false, true);
iter = mActiveCells.begin();
while (iter != mActiveCells.end())
auto iter = mInactiveCells.begin();
while (iter != mInactiveCells.end())
{
if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
it->mData.mY == (*iter)->getCell()->getGridY())
@ -796,8 +794,8 @@ namespace MWWorld
loadInactiveCell (cell, loadingListener, true);
activateCell (cell, loadingListener, false, true);
CellStoreCollection::iterator iter = mActiveCells.begin();
while (iter != mActiveCells.end())
auto iter = mInactiveCells.begin();
while (iter != mInactiveCells.end())
{
assert (!(*iter)->getCell()->isExterior());