use a generic File instead of DiskFile

engine/resource/Bundle.h

@@ -50,7 +50,7 @@ struct ArchiveEntry
 };
 
 class Filesystem;
-class DiskFile;
+class File;
 
 class Bundle
 {
@@ -64,10 +64,10 @@ public:
 	/// The resource stream points exactly at the start
 	/// of the useful resource data, so you do not have to
 	/// care about skipping headers, metadatas and so on.
-	virtual DiskFile*		open(ResourceId name) = 0;
+	virtual File*		open(ResourceId name) = 0;
 
 	/// Closes the resource file.
-	virtual void			close(DiskFile* resource) = 0;
+	virtual void			close(File* resource) = 0;
 };
 
 } // namespace crown

engine/resource/FileBundle.cpp

@@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "FileBundle.h"
 #include "Filesystem.h"
 #include "Resource.h"
-#include "DiskFile.h"
+#include "File.h"
 #include "Log.h"
 #include "StringUtils.h" 
 #include "OS.h"
@@ -51,7 +51,7 @@ FileBundle::~FileBundle()
 }
 
 //-----------------------------------------------------------------------------
-DiskFile* FileBundle::open(ResourceId name)
+File* FileBundle::open(ResourceId name)
 {
 	// Convert name/type into strings
 	char resource_name[512];
@@ -62,7 +62,7 @@ DiskFile* FileBundle::open(ResourceId name)
 	CE_ASSERT(exists == true, "Resource does not exist: %s", resource_name);
 
 	// Open the resource and check magic number/version
-	DiskFile* file = (DiskFile*)m_filesystem.open(g_default_mountpoint.value(), resource_name, FOM_READ);
+	File* file = (File*)m_filesystem.open(g_default_mountpoint.value(), resource_name, FOM_READ);
 
 	ResourceHeader header;
 	file->read(&header, sizeof(ResourceHeader));
@@ -74,7 +74,7 @@ DiskFile* FileBundle::open(ResourceId name)
 }
 
 //-----------------------------------------------------------------------------
-void FileBundle::close(DiskFile* resource)
+void FileBundle::close(File* resource)
 {
 	m_filesystem.close(resource);
 }

engine/resource/FileBundle.h

@@ -33,7 +33,7 @@ namespace crown
 {
 
 class Filesystem;
-class DiskFile;
+class File;
 
 const uint32_t	RESOURCE_MAGIC_NUMBER		= 0xCE010101;
 const uint32_t	RESOURCE_VERSION			= 2;
@@ -57,10 +57,10 @@ public:
 					~FileBundle();
 
 	/// @copydoc Bundle::open()
-	DiskFile*		open(ResourceId name);
+	File*			open(ResourceId name);
 
 	/// @copydoc Bundle::close()
-	void			close(DiskFile* resource);
+	void			close(File* resource);
 
 
 private:

engine/resource/MeshResource.cpp

@@ -27,7 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "MeshResource.h"
 #include "Bundle.h"
 #include "Log.h"
-#include "DiskFile.h"
+#include "File.h"
 #include "Assert.h"
 #include "Allocator.h"
 #include "Device.h"
@@ -39,7 +39,7 @@ namespace crown
 //-----------------------------------------------------------------------------
 void* MeshResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* file = bundle.open(id);
+	File* file = bundle.open(id);
 
 	CE_ASSERT(file != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
 

engine/resource/SoundResource.cpp

@@ -27,7 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "SoundResource.h"
 #include "Bundle.h"
 #include "Log.h"
-#include "DiskFile.h"
+#include "File.h"
 #include "Assert.h"
 #include "Allocator.h"
 #include "Device.h"
@@ -38,7 +38,7 @@ namespace crown
 //-----------------------------------------------------------------------------
 void* SoundResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* file = bundle.open(id);
+	File* file = bundle.open(id);
 
 	CE_ASSERT(file != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);
 

engine/resource/TextureResource.cpp

@@ -27,7 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "TextureResource.h"
 #include "Bundle.h"
 #include "Log.h"
-#include "DiskFile.h"
+#include "File.h"
 #include "Assert.h"
 #include "Allocator.h"
 #include "Device.h"
@@ -39,7 +39,7 @@ namespace crown
 //-----------------------------------------------------------------------------
 void* TextureResource::load(Allocator& allocator, Bundle& bundle, ResourceId id)
 {
-	DiskFile* file = bundle.open(id);
+	File* file = bundle.open(id);
 
 	CE_ASSERT(file != NULL, "Resource does not exist: %.8X%.8X", id.name, id.type);