From ace060748b572063b33acee13c19000783a6cdde Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 17 Jan 2015 13:21:02 +0100 Subject: Don't read from disk when checking volume type Should be faster than relying on the OS to cache the magic words. Also gets rid of the odd recursive call in VolumeDirectory. --- Source/Core/DiscIO/VolumeCreator.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Source/Core/DiscIO/VolumeCreator.cpp') diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 73feb93780..4b6053027c 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -120,15 +120,6 @@ IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, return nullptr; } -bool IsVolumeWiiDisc(const IVolume *_rVolume) -{ - u32 MagicWord = 0; - _rVolume->Read(0x18, 4, (u8*)&MagicWord, false); - - return (Common::swap32(MagicWord) == 0x5D1C9EA3); - //GameCube 0xc2339f3d -} - bool IsVolumeWadFile(const IVolume *_rVolume) { u32 MagicWord = 0; -- cgit v1.2.3