[Scummvm-cvs-logs] SF.net SVN: scummvm: [20942] residual/trunk

[marcus_c at users.sourceforge.net]

Revision: 20942
Author:   marcus_c
Date:     2006-02-26 10:38:35 -0800 (Sun, 26 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20942&view=rev

Log Message:
-----------
Delete all labs when the resourcemanager is deleted.

Modified Paths:
--------------
    residual/trunk/resource.cpp
    residual/trunk/resource.h
Modified: residual/trunk/resource.cpp
===================================================================
--- residual/trunk/resource.cpp	2006-02-26 18:09:06 UTC (rev 20941)
+++ residual/trunk/resource.cpp	2006-02-26 18:38:35 UTC (rev 20942)
@@ -109,6 +109,13 @@
 		error("Cannot find any resource files in %s - check configuration file", dir_str.c_str());
 }
 
+ResourceLoader::~ResourceLoader()
+{
+	for(LabList::const_iterator i = _labs.begin();
+	    i != _labs.end(); i++)
+		delete (*i);
+}
+
 const Lab *ResourceLoader::findFile(const char *filename) const {
 	for (LabList::const_iterator i = _labs.begin(); i != _labs.end(); i++)
 		if ((*i)->fileExists(filename))

Modified: residual/trunk/resource.h
===================================================================
--- residual/trunk/resource.h	2006-02-26 18:09:06 UTC (rev 20941)
+++ residual/trunk/resource.h	2006-02-26 18:38:35 UTC (rev 20942)
@@ -104,7 +104,7 @@
 
 	ResourceLoader();
 	ResourceLoader(const ResourceLoader &);
-	~ResourceLoader() { }
+	~ResourceLoader();
 	const Lab *findFile(const char *filename) const;
 private: