Jelajahi Sumber

fix Bundle according to MountPoint implementation

mikymod 12 tahun lalu
induk
melakukan
7c2cb28b5a
2 mengubah file dengan 5 tambahan dan 3 penghapusan
  1. 1 1
      engine/resource/ArchiveBundle.cpp
  2. 4 2
      engine/resource/FileBundle.cpp

+ 1 - 1
engine/resource/ArchiveBundle.cpp

@@ -42,7 +42,7 @@ ArchiveBundle::ArchiveBundle(Filesystem& fs) :
 	m_entries(NULL)
 {
 	// FIXME Default archive name
-	m_archive_file = (DiskFile*)m_filesystem.open("archive.bin", FOM_READ);
+	m_archive_file = (DiskFile*)m_filesystem.open("disk", "archive.bin", FOM_READ);
 	
 	ArchiveHeader header;
 	

+ 4 - 2
engine/resource/FileBundle.cpp

@@ -54,12 +54,14 @@ DiskFile* FileBundle::open(ResourceId name)
 	char resource_name[512];
 	snprintf(resource_name, 512, "%.8X%.8X", name.name, name.type);
 
+	Log::i("name: %s", resource_name);
+	
 	// Search the resource in the filesystem
-	bool exists = m_filesystem.exists(resource_name);
+	bool exists = m_filesystem.exists("disk", resource_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(resource_name, FOM_READ);
+	DiskFile* file = (DiskFile*)m_filesystem.open("disk", resource_name, FOM_READ);
 
 	ResourceHeader header;
 	file->read(&header, sizeof(ResourceHeader));