Merge pull request #12388 from lioncash/compare

GameFile: Default GameBanner operator==
This commit is contained in:
Admiral H. Curtiss 2023-12-11 23:25:27 +01:00 committed by GitHub
commit 16ba56a34b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions

View File

@ -70,16 +70,6 @@ DiscIO::Language GameFile::GetConfigLanguage() const
return SConfig::GetInstance().GetLanguageAdjustedForRegion(DiscIO::IsWii(m_platform), m_region);
}
bool operator==(const GameBanner& lhs, const GameBanner& rhs)
{
return std::tie(lhs.buffer, lhs.width, lhs.height) == std::tie(rhs.buffer, rhs.width, rhs.height);
}
bool operator!=(const GameBanner& lhs, const GameBanner& rhs)
{
return !operator==(lhs, rhs);
}
const std::string& GameFile::Lookup(DiscIO::Language language,
const std::map<DiscIO::Language, std::string>& strings)
{

View File

@ -27,6 +27,9 @@ struct GameBanner
std::vector<u32> buffer;
u32 width{};
u32 height{};
bool operator==(const GameBanner&) const = default;
bool empty() const { return buffer.empty(); }
void DoState(PointerWrap& p);
};
@ -38,9 +41,6 @@ struct GameCover
void DoState(PointerWrap& p);
};
bool operator==(const GameBanner& lhs, const GameBanner& rhs);
bool operator!=(const GameBanner& lhs, const GameBanner& rhs);
// This class caches the metadata of a DiscIO::Volume (or a DOL/ELF file).
class GameFile final
{