NEVERHOOD: Implement resource cache purging and purge it after each s…

…cene
scummvm · May 8, 2013 · fec1d78 · fec1d78
1 parent 30178e4
commit fec1d78
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/engines/neverhood/resourceman.cpp b/engines/neverhood/resourceman.cpp
@@ -116,4 +116,14 @@ void ResourceMan::unloadResource(ResourceHandle &resourceHandle) {
 	}
 }
 
+void ResourceMan::purgeResources() {
+	for (Common::HashMap<uint32, ResourceData*>::iterator it = _data.begin(); it != _data.end(); ++it) {
+		ResourceData *resourceData = (*it)._value;
+		if (resourceData->dataRefCount == 0) {
+			delete resourceData->data;
+			resourceData->data = NULL;
+		}
+	}
+}
+
 } // End of namespace Neverhood
diff --git a/engines/neverhood/resourceman.h b/engines/neverhood/resourceman.h
@@ -80,6 +80,7 @@ class ResourceMan {
 	void queryResource(uint32 fileHash, ResourceHandle &resourceHandle);
 	void loadResource(ResourceHandle &resourceHandle);
 	void unloadResource(ResourceHandle &resourceHandle);
+	void purgeResources();
 protected:
 	typedef Common::HashMap<uint32, ResourceFileEntry> EntriesMap;
 	Common::Array<BlbArchive*> _archives;

diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp
@@ -70,6 +70,9 @@ Scene::~Scene() {
 		delete *iter;
 
 	// Don't delete surfaces since they always belong to an entity
+
+	// Purge the resources after each scene
+	_vm->_res->purgeResources();
 
 }