From fed3c10c60c732a58162f292492d2b51831123f0 Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Sun, 27 May 2018 14:02:47 -0500 Subject: [PATCH] [VFS] Properly detect STFS volume descriptor type --- src/xenia/vfs/devices/stfs_container_device.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/xenia/vfs/devices/stfs_container_device.cc b/src/xenia/vfs/devices/stfs_container_device.cc index addcbab04..a085844f8 100644 --- a/src/xenia/vfs/devices/stfs_container_device.cc +++ b/src/xenia/vfs/devices/stfs_container_device.cc @@ -117,15 +117,6 @@ bool StfsContainerDevice::Initialize() { return false; } - if (header_.content_type == StfsContentType::kGamesOnDemand) { - // Special format. This is just GDF packed into a STFS container. - // We can't deal with this at runtime. Ask the user to extract it. - XELOGE( - "GoD containers are unsupported natively! Use a tool to extract the " - "archive."); - return false; - } - result = ReadAllEntries(map_ptr); if (result != Error::kSuccess) { XELOGE("STFS entry reading failed: %d", result); @@ -402,7 +393,7 @@ bool StfsHeader::Read(const uint8_t* p) { std::memcpy(profile_id, p + 0x371, 0x8); data_file_count = xe::load_and_swap(p + 0x39D); data_file_combined_size = xe::load_and_swap(p + 0x3A1); - descriptor_type = (StfsDescriptorType)xe::load_and_swap(p + 0x3A9); + descriptor_type = (StfsDescriptorType)xe::load_and_swap(p + 0x3A9); if (descriptor_type != StfsDescriptorType::kStfs) { XELOGE("STFS descriptor format not supported: %d", descriptor_type); return false;