diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index 8a0a57fca..c03c073b3 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/citra_qt/game_list_p.h @@ -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(), [®ions](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 = diff --git a/src/core/loader/smdh.cpp b/src/core/loader/smdh.cpp index 417f8d074..1b9503d1d 100644 --- a/src/core/loader/smdh.cpp +++ b/src/core/loader/smdh.cpp @@ -49,10 +49,6 @@ std::array SMDH::GetShortTitle(Loader::SMDH::TitleLanguage language) } std::vector SMDH::GetRegions() const { - if (region_lockout == 0x7fffffff) { - return std::vector{GameRegion::RegionFree}; - } - constexpr u32 REGION_COUNT = 7; std::vector result; for (u32 region = 0; region < REGION_COUNT; ++region) { diff --git a/src/core/loader/smdh.h b/src/core/loader/smdh.h index adeea05a9..2156dec9c 100644 --- a/src/core/loader/smdh.h +++ b/src/core/loader/smdh.h @@ -70,7 +70,6 @@ struct SMDH { China = 4, Korea = 5, Taiwan = 6, - RegionFree = 7, }; /**