diff options
| author | JosJuice <josjuice@gmail.com> | 2015-01-17 13:21:02 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2015-01-17 13:21:02 +0100 |
| commit | ace060748b572063b33acee13c19000783a6cdde (patch) | |
| tree | 0569a779c5d7fec8f954e09ef732b1972f4021a5 /Source/Core/DiscIO/BannerLoader.cpp | |
| parent | 11a36ca8e28b233f34f5c48be19fabeea92f6d38 (diff) | |
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.
Diffstat (limited to 'Source/Core/DiscIO/BannerLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/BannerLoader.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/BannerLoader.cpp b/Source/Core/DiscIO/BannerLoader.cpp index 3dc989684a..b5353b5a0f 100644 --- a/Source/Core/DiscIO/BannerLoader.cpp +++ b/Source/Core/DiscIO/BannerLoader.cpp @@ -8,7 +8,6 @@ #include "DiscIO/BannerLoaderGC.h" #include "DiscIO/BannerLoaderWii.h" #include "DiscIO/Filesystem.h" -#include "DiscIO/VolumeCreator.h" namespace DiscIO { @@ -18,7 +17,7 @@ class IVolume; IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume) { - if (IsVolumeWiiDisc(pVolume) || IsVolumeWadFile(pVolume)) + if (pVolume->IsWiiDisc() || pVolume->IsWadFile()) return new CBannerLoaderWii(pVolume); if (_rFileSystem.IsValid()) return new CBannerLoaderGC(_rFileSystem, pVolume); |