diff options
| author | JosJuice <josjuice@gmail.com> | 2021-03-09 21:06:57 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-03-10 00:16:37 +0100 |
| commit | 7d570f1edb063dd2b486eb63cc78f9382b83a354 (patch) | |
| tree | d13bf0c07a9bddcd047a0435505b1a9259a0a667 /Source/Core/DiscIO/Volume.cpp | |
| parent | b14bf8273245374e14b1b62a1ba5e26e4cccf42d (diff) | |
DiscIO: Move magic constants for discs to DiscUtils
Diffstat (limited to 'Source/Core/DiscIO/Volume.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Volume.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/Volume.cpp b/Source/Core/DiscIO/Volume.cpp index ab4b0e562b..911a486a4e 100644 --- a/Source/Core/DiscIO/Volume.cpp +++ b/Source/Core/DiscIO/Volume.cpp @@ -20,6 +20,7 @@ #include "Core/IOS/ES/Formats.h" #include "DiscIO/Blob.h" +#include "DiscIO/DiscUtils.h" #include "DiscIO/Enums.h" #include "DiscIO/VolumeDisc.h" #include "DiscIO/VolumeGC.h" @@ -87,14 +88,10 @@ std::map<Language, std::string> Volume::ReadWiiNames(const std::vector<char16_t> static std::unique_ptr<VolumeDisc> CreateDisc(std::unique_ptr<BlobReader>& reader) { - // Check for Wii - const std::optional<u32> wii_magic = reader->ReadSwapped<u32>(0x18); - if (wii_magic == u32(0x5D1C9EA3)) + if (reader->ReadSwapped<u32>(0x18) == WII_DISC_MAGIC) return std::make_unique<VolumeWii>(std::move(reader)); - // Check for GC - const std::optional<u32> gc_magic = reader->ReadSwapped<u32>(0x1C); - if (gc_magic == u32(0xC2339F3D)) + if (reader->ReadSwapped<u32>(0x1C) == GAMECUBE_DISC_MAGIC) return std::make_unique<VolumeGC>(std::move(reader)); // No known magic words found |