diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-16 11:03:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 11:03:36 +0100 |
| commit | c8d8f9ef8506e8ca30b134b307b77a95c7b91623 (patch) | |
| tree | ea39d6f9c2bd07120d3edaf38d7b10a16b1264a8 /Source/Core/DiscIO/DirectoryBlob.cpp | |
| parent | 3fcc018fa7173e80b52758ca81b5d00eef018ac6 (diff) | |
| parent | e47c9764de5c2e8f273c9dcf52b3730914f05521 (diff) | |
Merge pull request #9577 from JosJuice/di-unknown-size-hack
DVDInterface: Make the WBFS/CISO hack only affect WBFS/CISO
Diffstat (limited to 'Source/Core/DiscIO/DirectoryBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DirectoryBlob.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index 8840283777..65451a33d1 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -28,6 +28,7 @@ #include "Core/Boot/DolReader.h" #include "Core/IOS/ES/Formats.h" #include "DiscIO/Blob.h" +#include "DiscIO/DiscUtils.h" #include "DiscIO/VolumeWii.h" #include "DiscIO/WiiEncryptionCache.h" @@ -653,8 +654,8 @@ void DirectoryBlobPartition::SetDiscHeaderAndDiscType(std::optional<bool> is_wii } else { - m_is_wii = Common::swap32(&m_disc_header[0x18]) == 0x5d1c9ea3; - const bool is_gc = Common::swap32(&m_disc_header[0x1c]) == 0xc2339f3d; + m_is_wii = Common::swap32(&m_disc_header[0x18]) == WII_DISC_MAGIC; + const bool is_gc = Common::swap32(&m_disc_header[0x1c]) == GAMECUBE_DISC_MAGIC; if (m_is_wii == is_gc) ERROR_LOG_FMT(DISCIO, "Couldn't detect disc type based on {}", boot_bin_path); } |