forked from mirror/openmw-tes3mp
fixed crash bug
This commit is contained in:
parent
012a41427c
commit
6d8cfa7dfa
3 changed files with 18 additions and 20 deletions
|
@ -152,9 +152,9 @@ namespace MWWorld
|
||||||
|
|
||||||
Scene::~Scene()
|
Scene::~Scene()
|
||||||
{
|
{
|
||||||
/*for (CellRenderCollection::iterator iter (mActiveCells.begin());
|
for (CellRenderCollection::iterator iter (mActiveCells.begin());
|
||||||
iter!=mActiveCells.end(); ++iter)
|
iter!=mActiveCells.end(); ++iter)
|
||||||
delete iter->second;*/
|
delete iter->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Scene::hasCellChanged() const
|
bool Scene::hasCellChanged() const
|
||||||
|
@ -217,4 +217,3 @@ namespace MWWorld
|
||||||
mCellChanged = false;
|
mCellChanged = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ namespace MWWorld
|
||||||
|
|
||||||
typedef std::map<Ptr::CellStore *, MWRender::CellRender *> CellRenderCollection;
|
typedef std::map<Ptr::CellStore *, MWRender::CellRender *> CellRenderCollection;
|
||||||
|
|
||||||
MWRender::MWScene mScene;
|
MWRender::MWScene& mScene;
|
||||||
Ptr::CellStore *mCurrentCell; // the cell, the player is in
|
Ptr::CellStore *mCurrentCell; // the cell, the player is in
|
||||||
CellRenderCollection mActiveCells;
|
CellRenderCollection mActiveCells;
|
||||||
bool mCellChanged;
|
bool mCellChanged;
|
||||||
|
|
|
@ -317,10 +317,10 @@ namespace MWWorld
|
||||||
|
|
||||||
World::~World()
|
World::~World()
|
||||||
{
|
{
|
||||||
delete mPlayer;
|
delete mWorldScene;
|
||||||
delete mSkyManager;
|
delete mSkyManager;
|
||||||
delete mGlobalVariables;
|
delete mGlobalVariables;
|
||||||
//delete mWorldScene;
|
delete mPlayer;
|
||||||
delete mPhysics;
|
delete mPhysics;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -768,4 +768,3 @@ namespace MWWorld
|
||||||
return std::make_pair (stream.str(), created);
|
return std::make_pair (stream.str(), created);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue