rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

カナダがcoppa判定から漏れていたので追加

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@796 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2014-04-30 07:16:13 +00:00
parent 7a5716f61e
commit d242effc01
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp
View File

@ -63,7 +63,8 @@ bool AgeChecker::IsPinRestrictionRequired(u32 age, CfgRegionCode region, CfgCoun
bool AgeChecker::IsCoppaRequired(u32 age, nn::cfg::CTR::CfgRegionCode region, nn::cfg::CTR::CfgCountryCode country)
{
if (region == CFG_REGION_AMERICA && country == CFG_COUNTRY_UNITED_STATES && age < COPPA_REQUIRED_AGE)
if ((region == CFG_REGION_AMERICA && country == CFG_COUNTRY_UNITED_STATES && age < COPPA_REQUIRED_AGE) ||
(region == CFG_REGION_AMERICA && country == CFG_COUNTRY_CANADA && age < COPPA_REQUIRED_AGE))
{
return true;
}

38
trunk/ConsoleDataMigration/sources/tests/googletest/AgeChecker/testAgeChecker.cpp
View File

@ -32,19 +32,15 @@ TEST(testPin, B)
// B-4
ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA));
ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND));
// B-5
ASSERT_FALSE(ac.IsPinRestrictionRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
}
TEST(testPin, C)
TEST(testPin, D)
{
ConsoleRestore::AgeChecker ac;
// C-1
ASSERT_FALSE(ac.IsPinRestrictionRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
// C-2
ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
// C-3
ASSERT_FALSE(ac.IsPinRestrictionRequired(17, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
// C-4
// D-1, 2
ASSERT_FALSE(ac.IsPinRestrictionRequired(18, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
}
@ -52,10 +48,26 @@ TEST(testCoppa, all)
{
ConsoleRestore::AgeChecker ac;
// A-1
ASSERT_TRUE(ac.IsPinRestrictionRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES));
// その他
ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES));
ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM));
ASSERT_FALSE(ac.IsPinRestrictionRequired(13, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
ASSERT_TRUE(ac.IsCoppaRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES));
// A-2
ASSERT_TRUE(ac.IsCoppaRequired(12, CFG_REGION_AMERICA, CFG_COUNTRY_CANADA));
// A-3
ASSERT_FALSE(ac.IsCoppaRequired(12, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM));
// A-4
ASSERT_FALSE(ac.IsCoppaRequired(17, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA));
ASSERT_FALSE(ac.IsCoppaRequired(17, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND));
// B-1
ASSERT_FALSE(ac.IsCoppaRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_UNITED_STATES));
// B-2
ASSERT_FALSE(ac.IsCoppaRequired(13, CFG_REGION_AMERICA, CFG_COUNTRY_CANADA));
// B-3
ASSERT_FALSE(ac.IsCoppaRequired(13, CFG_REGION_EUROPE, CFG_COUNTRY_UNITED_KINGDOM));
// B-4
ASSERT_FALSE(ac.IsCoppaRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_AUSTRALIA));
ASSERT_FALSE(ac.IsCoppaRequired(18, CFG_REGION_EUROPE, CFG_COUNTRY_NEW_ZEALAND));
// B-5
ASSERT_FALSE(ac.IsCoppaRequired(12, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
// D-1, 2
ASSERT_FALSE(ac.IsCoppaRequired(18, CFG_REGION_JAPAN, CFG_COUNTRY_JAPAN));
}