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

Iterate over mInactiveCells when unloading cells in TestCells / TestInteriorCells. Otherwise we dereference an invalid iterator after deactiveCell().

Browse Source
This commit is contained in:
fredzio 2021-08-31 16:53:52 +02:00 committed by Frederic Chardon
parent 0daf6f5d0b
commit d1a5bc207b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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())+")..."); 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); CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(it->mData.mX, it->mData.mY);
loadInactiveCell (cell, loadingListener, true); loadInactiveCell (cell, loadingListener, true);
activateCell (cell, loadingListener, false, true); activateCell (cell, loadingListener, false, true);
iter = mActiveCells.begin(); auto iter = mInactiveCells.begin();
while (iter != mActiveCells.end()) while (iter != mInactiveCells.end())
{ {
if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() && if (it->isExterior() && it->mData.mX == (*iter)->getCell()->getGridX() &&
it->mData.mY == (*iter)->getCell()->getGridY()) it->mData.mY == (*iter)->getCell()->getGridY())
@ -796,8 +794,8 @@ namespace MWWorld
loadInactiveCell (cell, loadingListener, true); loadInactiveCell (cell, loadingListener, true);
activateCell (cell, loadingListener, false, true); activateCell (cell, loadingListener, false, true);
CellStoreCollection::iterator iter = mActiveCells.begin(); auto iter = mInactiveCells.begin();
while (iter != mActiveCells.end()) while (iter != mInactiveCells.end())
{ {
assert (!(*iter)->getCell()->isExterior()); assert (!(*iter)->getCell()->isExterior());