DiscIO: Centralize the banner pointer and validity boolean into IBannerLoader

These are both used within the banner loaders, and IsValid is exactly the
same. So this makes sense.
This commit is contained in:
Lioncash
2014-06-29 15:38:48 -04:00
parent d800b5fb74
commit f78b94077e
5 changed files with 13 additions and 30 deletions

View File

@ -16,9 +16,7 @@
namespace DiscIO
{
CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume)
: m_pBannerFile(nullptr)
, m_IsValid(false)
, m_country(volume->GetCountry())
: m_country(volume->GetCountry())
{
// load the opening.bnr
size_t FileSize = (size_t) _rFileSystem.GetFileSize("opening.bnr");
@ -49,12 +47,6 @@ CBannerLoaderGC::~CBannerLoaderGC()
}
}
bool CBannerLoaderGC::IsValid()
{
return m_IsValid;
}
std::vector<u32> CBannerLoaderGC::GetBanner(int* pWidth, int* pHeight)
{
std::vector<u32> Buffer;