Err, rework ResourceManager a bit, previous commit related to ResourceLoader

src/ResourceManager.cpp

@@ -34,8 +34,8 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-ResourceManager::ResourceManager() :
-	m_resource_loader(this),
+ResourceManager::ResourceManager(Filesystem* filesystem) :
+	m_resource_loader(this, filesystem),
 	m_resources(m_allocator)
 {
 }
@@ -110,23 +110,18 @@ void ResourceManager::reload(ResourceId name)
 	
 	if (entry.state == RS_LOADED)
 	{
-	
+		// FIXME
 	}
 }
 
 //-----------------------------------------------------------------------------
 bool ResourceManager::has(ResourceId name)
 {
-	if (m_resources.size() <= name.index)
-	{
-		return false;
-	}
-
-	if (m_resources[name.index].id.name == name.name)
+	if (m_resources.size() > name.index)
 	{
-		return true;
+		return (m_resources[name.index].id.name == name.name);
 	}
-
+	
 	return false;
 }
 

src/ResourceManager.h

@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
+class Filesystem;
+
 struct ResourceEntry
 {
 	ResourceId		id;
@@ -61,13 +63,14 @@ class ResourceManager
 {
 public:
 
-							ResourceManager();
+							ResourceManager(Filesystem* filesystem);
 							~ResourceManager();
 
 	ResourceId				load(const char* name);
 	ResourceId				load(uint32_t name);
 
 	void					unload(ResourceId name);
+
 	void					reload(ResourceId name);
 
 	bool					has(ResourceId name);