teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix crash when exception is thrown in startNewGame()

Browse source
This commit is contained in:
scrawl 2015-11-27 21:38:57 +01:00
parent 177a6f4a68
commit 5b8fd79b4b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/actors.cpp
View file

@ -926,7 +926,7 @@ namespace MWMechanics
PtrActorMap::iterator iter = mActors.begin(); PtrActorMap::iterator iter = mActors.begin();
while(iter != mActors.end()) while(iter != mActors.end())
{ {
if(iter->first.getCell()==cellStore && iter->first != ignore) if((iter->first.isInCell() && iter->first.getCell()==cellStore) && iter->first != ignore)
{ {
delete iter->second; delete iter->second;
mActors.erase(iter++); mActors.erase(iter++);

2
apps/openmw/mwrender/ripplesimulation.cpp
View file

@ -185,7 +185,7 @@ void RippleSimulation::removeCell(const MWWorld::CellStore *store)
{ {
for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end();) for (std::vector<Emitter>::iterator it = mEmitters.begin(); it != mEmitters.end();)
{ {
if (it->mPtr.getCell() == store && it->mPtr != MWMechanics::getPlayer()) if ((it->mPtr.isInCell() && it->mPtr.getCell() == store) && it->mPtr != MWMechanics::getPlayer())
{ {
it = mEmitters.erase(it); it = mEmitters.erase(it);
} }