summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-12-24 22:18:28 +0100
committerZach Hilman <zachhilman@gmail.com>2018-12-28 21:30:36 +0100
commitabbcc8e61e33ba093df9c823a03c70eccf010e4c (patch)
tree13a0b705139336b59f491e216febc9d1859da0d7
parentam: Add size parameter to am:IStorage logging (diff)
downloadyuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.gz
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.bz2
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.lz
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.xz
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.zst
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.zip
-rw-r--r--src/core/file_sys/romfs.cpp3
-rw-r--r--src/core/file_sys/romfs.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cpp
index 81e1f66ac..ebbdf081e 100644
--- a/src/core/file_sys/romfs.cpp
+++ b/src/core/file_sys/romfs.cpp
@@ -119,6 +119,9 @@ VirtualDir ExtractRomFS(VirtualFile file, RomFSExtractionType type) {
VirtualDir out = std::move(root);
+ if (type == RomFSExtractionType::SingleDiscard)
+ return out->GetSubdirectories().front();
+
while (out->GetSubdirectories().size() == 1 && out->GetFiles().empty()) {
if (out->GetSubdirectories().front()->GetName() == "data" &&
type == RomFSExtractionType::Truncated)
diff --git a/src/core/file_sys/romfs.h b/src/core/file_sys/romfs.h
index 0ec404731..0f35639bc 100644
--- a/src/core/file_sys/romfs.h
+++ b/src/core/file_sys/romfs.h
@@ -33,8 +33,9 @@ struct IVFCHeader {
static_assert(sizeof(IVFCHeader) == 0xE0, "IVFCHeader has incorrect size.");
enum class RomFSExtractionType {
- Full, // Includes data directory
- Truncated, // Traverses into data directory
+ Full, // Includes data directory
+ Truncated, // Traverses into data directory
+ SingleDiscard, // Traverses into the first subdirectory of root
};
// Converts a RomFS binary blob to VFS Filesystem