citra-emu
/
citra-canary
Archived
1
0
Fork 0

Remove old region free logic

This commit is contained in:
zhupengfei 2019-08-20 21:03:41 +08:00
parent 4144f4480d
commit 531bf857f5
No known key found for this signature in database
GPG Key ID: DD129E108BD09378
3 changed files with 3 additions and 12 deletions

View File

@ -92,16 +92,12 @@ static QString GetRegionFromSMDH(const Loader::SMDH& smdh) {
return QObject::tr("Invalid region");
}
if (std::find(regions.begin(), regions.end(), GameRegion::RegionFree) != regions.end()) {
return QObject::tr("Region free");
}
const bool all_regions =
const bool region_free =
std::all_of(regions_map.begin(), regions_map.end(), [&regions](const auto& it) {
return std::find(regions.begin(), regions.end(), it.first) != regions.end();
});
if (all_regions) {
return QObject::tr("All regions");
if (region_free) {
return QObject::tr("Region free");
}
const QString separator =

View File

@ -49,10 +49,6 @@ std::array<u16, 0x40> SMDH::GetShortTitle(Loader::SMDH::TitleLanguage language)
}
std::vector<SMDH::GameRegion> SMDH::GetRegions() const {
if (region_lockout == 0x7fffffff) {
return std::vector<GameRegion>{GameRegion::RegionFree};
}
constexpr u32 REGION_COUNT = 7;
std::vector<GameRegion> result;
for (u32 region = 0; region < REGION_COUNT; ++region) {

View File

@ -70,7 +70,6 @@ struct SMDH {
China = 4,
Korea = 5,
Taiwan = 6,
RegionFree = 7,
};
/**