From 4387432436c072944d7ee3e2554ac1cbad024441 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 31 Mar 2018 14:04:13 +0200 Subject: DiscIO: Don't use all uppercase for enum values Also removing some prefixes that we don't need now that we're using enum classes instead of plain enums. --- Source/Core/DiscIO/DiscExtractor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/Core/DiscIO/DiscExtractor.cpp') diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index e616a9cac1..7837516f29 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -153,7 +153,7 @@ void ExportDirectory(const Volume& volume, const Partition& partition, const Fil bool ExportWiiUnencryptedHeader(const Volume& volume, const std::string& export_filename) { - if (volume.GetVolumeType() != Platform::WII_DISC) + if (volume.GetVolumeType() != Platform::WiiDisc) return false; return ExportData(volume, PARTITION_NONE, 0, 0x100, export_filename); @@ -161,7 +161,7 @@ bool ExportWiiUnencryptedHeader(const Volume& volume, const std::string& export_ bool ExportWiiRegionData(const Volume& volume, const std::string& export_filename) { - if (volume.GetVolumeType() != Platform::WII_DISC) + if (volume.GetVolumeType() != Platform::WiiDisc) return false; return ExportData(volume, PARTITION_NONE, 0x4E000, 0x20, export_filename); @@ -170,7 +170,7 @@ bool ExportWiiRegionData(const Volume& volume, const std::string& export_filenam bool ExportTicket(const Volume& volume, const Partition& partition, const std::string& export_filename) { - if (volume.GetVolumeType() != Platform::WII_DISC) + if (volume.GetVolumeType() != Platform::WiiDisc) return false; return ExportData(volume, PARTITION_NONE, partition.offset, 0x2a4, export_filename); @@ -178,7 +178,7 @@ bool ExportTicket(const Volume& volume, const Partition& partition, bool ExportTMD(const Volume& volume, const Partition& partition, const std::string& export_filename) { - if (volume.GetVolumeType() != Platform::WII_DISC) + if (volume.GetVolumeType() != Platform::WiiDisc) return false; const std::optional size = volume.ReadSwapped(partition.offset + 0x2a4, PARTITION_NONE); @@ -193,7 +193,7 @@ bool ExportTMD(const Volume& volume, const Partition& partition, const std::stri bool ExportCertificateChain(const Volume& volume, const Partition& partition, const std::string& export_filename) { - if (volume.GetVolumeType() != Platform::WII_DISC) + if (volume.GetVolumeType() != Platform::WiiDisc) return false; const std::optional size = volume.ReadSwapped(partition.offset + 0x2ac, PARTITION_NONE); @@ -208,7 +208,7 @@ bool ExportCertificateChain(const Volume& volume, const Partition& partition, bool ExportH3Hashes(const Volume& volume, const Partition& partition, const std::string& export_filename) { - if (volume.GetVolumeType() != Platform::WII_DISC) + if (volume.GetVolumeType() != Platform::WiiDisc) return false; const std::optional offset = @@ -351,7 +351,7 @@ bool ExportSystemData(const Volume& volume, const Partition& partition, success &= ExportDOL(volume, partition, export_folder + "/sys/main.dol"); success &= ExportFST(volume, partition, export_folder + "/sys/fst.bin"); - if (volume.GetVolumeType() == Platform::WII_DISC) + if (volume.GetVolumeType() == Platform::WiiDisc) { File::CreateFullPath(export_folder + "/disc/"); success &= ExportWiiUnencryptedHeader(volume, export_folder + "/disc/header.bin"); -- cgit v1.2.3