mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 23:39:42 +00:00
Code Issues Releases Wiki Activity

Fix cleanup issue

Browse source
This commit is contained in:
scrawl 2016-02-10 19:08:17 +01:00
parent d3808580b0
commit 6bfeb118d7
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwworld/cellpreloader.cpp
View file

@ -169,6 +169,13 @@ namespace MWWorld
{ {
} }
CellPreloader::~CellPreloader()
{
for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();++it)
it->second.mWorkItem->waitTillDone();
mPreloadCells.clear();
}
void CellPreloader::preload(CellStore *cell, double timestamp) void CellPreloader::preload(CellStore *cell, double timestamp)
{ {
if (!mWorkQueue) if (!mWorkQueue)

1
apps/openmw/mwworld/cellpreloader.hpp
View file

@ -24,6 +24,7 @@ namespace MWWorld
{ {
public: public:
CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain); CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain);
~CellPreloader();
/// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell. /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
/// @note The cell itself must be in State_Loaded or State_Preloaded. /// @note The cell itself must be in State_Loaded or State_Preloaded.