From 03918872c38e0099f09e3b5e8a847e60fbc77485 Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 10 Apr 2014 00:41:41 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=95=B0=E3=81=AB=E7=BD=AE=E3=81=8D?= =?UTF-8?q?=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@783 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/AgeChecker.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp index 2ad4181..f06224a 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/AgeChecker.cpp @@ -20,6 +20,11 @@ using namespace nn::cfg::CTR; namespace ConsoleRestore { +const u32 PIN_REQUIRED_AGE_IN_AUSTRALIA_AND_NEW_ZEALAND = 18; +const u32 PIN_REQUIRED_AGE_IN_EUROPE = 13; +const u32 PIN_REQUIRED_AGE_IN_UNITED_STATES_AND_CANADA = 13; +const u32 COPPA_REQUIRED_AGE = 13; + AgeChecker::AgeChecker() { // TODO 自動生成されたコンストラクター・スタブ @@ -39,14 +44,19 @@ bool AgeChecker::IsPinRestrictionRequired(u32 age, CfgRegionCode region, CfgCoun { case CFG_COUNTRY_AUSTRALIA: case CFG_COUNTRY_NEW_ZEALAND: - return age < 18; + { + return age < PIN_REQUIRED_AGE_IN_AUSTRALIA_AND_NEW_ZEALAND; + } + break; default: - return age < 13; + { + return age < PIN_REQUIRED_AGE_IN_EUROPE; + } } } else if (region == CFG_REGION_AMERICA && (country == CFG_COUNTRY_UNITED_STATES || country == CFG_COUNTRY_CANADA)) { - return age < 13; + return age < PIN_REQUIRED_AGE_IN_UNITED_STATES_AND_CANADA; } return false; @@ -54,7 +64,7 @@ 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 < 13) + if (region == CFG_REGION_AMERICA && country == CFG_COUNTRY_UNITED_STATES && age < COPPA_REQUIRED_AGE) { return true; }