mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-04 21:51:35 +00:00
Code Issues Releases Wiki Activity

[Client] Fix infinite loop in CellController

Browse source 
Previously, using CellController::getCellStore() to get an unloaded CellStore would make its references get loaded in the process, with the CellStore's loadRefs() then running updateMergedRefs(), which in turn – before getting as far as setting the CellStore's state to State_Loaded – would call CellController::hasLocalAuthority() on its accompanying ESM::Cell, which would then run CellController::isActiveWorldCell(), which would then run CellController::getCellStore() to get the CellStore again, which – still being marked as unloaded – would run the whole loop again... and again.
This commit is contained in:
David Cernat 2019-09-23 21:18:38 +03:00
parent d4df2948dd
commit 339428872e
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/world.hpp
View file

@ -589,7 +589,7 @@ namespace MWBase
Make it possible to check whether a cell is active
*/
virtual bool isCellActive(MWWorld::CellStore* cell) = 0;
virtual bool isCellActive(const ESM::Cell& cell) = 0;
/*
End of tes3mp addition
*/

8
apps/openmw/mwmp/CellController.cpp
View file

@ -35,7 +35,7 @@ void CellController::updateLocal(bool forceUpdate)
{
mwmp::Cell *mpCell = it->second;
if (!MWBase::Environment::get().getWorld()->isCellActive(mpCell->getCellStore()))
if (!MWBase::Environment::get().getWorld()->isCellActive(*mpCell->getCellStore()->getCell()))
{
mpCell->uninitializeLocalActors();
mpCell->uninitializeDedicatedActors();
@ -323,11 +323,7 @@ bool CellController::isInitializedCell(const ESM::Cell& cell)
bool CellController::isActiveWorldCell(const ESM::Cell& cell)
{
MWWorld::CellStore *cellStore = getCellStore(cell);
if (!cellStore) return false;
return MWBase::Environment::get().getWorld()->isCellActive(cellStore);
return MWBase::Environment::get().getWorld()->isCellActive(cell);
}
Cell *CellController::getCell(const ESM::Cell& cell)

15
apps/openmw/mwworld/worldimp.cpp
View file

@ -2905,9 +2905,20 @@ namespace MWWorld
Make it possible to check whether a cell is active
*/
bool World::isCellActive(MWWorld::CellStore* cell)
bool World::isCellActive(const ESM::Cell& cell)
{
return mWorldScene->isCellActive(*cell);
const Scene::CellStoreCollection& activeCells = mWorldScene->getActiveCells();
mwmp::CellController *cellController = mwmp::Main::get().getCellController();
for (auto it = activeCells.begin(); it != activeCells.end(); ++it)
{
if (cellController->isSameCell(cell, *(*it)->getCell()))
{
return true;
}
}
return false;
}
/*
End of tes3mp addition

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -697,7 +697,7 @@ namespace MWWorld
Make it possible to check whether a cell is active
*/
bool isCellActive(MWWorld::CellStore* cell) override;
bool isCellActive(const ESM::Cell& cell) override;
/*
End of tes3mp addition
*/