Merge pull request #2240 from wwylele/auto-region

Config: auto-select region and language
This commit is contained in:
bunnei 2016-12-29 22:09:01 -05:00 committed by GitHub
commit f556d6ee90
11 changed files with 108 additions and 7 deletions

View file

@ -89,7 +89,8 @@ void Config::ReadValues() {
// System
Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false);
Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1);
Settings::values.region_value =
sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT);
// Miscellaneous
Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info");

View file

@ -101,7 +101,7 @@ use_virtual_sd =
is_new_3ds =
# The system region that Citra will use during emulation
# 0: Japan, 1: USA (default), 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
region_value =
[Miscellaneous]