summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-05-11 23:50:07 +0200
committerbunnei <bunneidev@gmail.com>2020-05-11 23:50:07 +0200
commit988e42a3f57e427e4f91172086ccc8a9a52f73eb (patch)
tree66ba9ab9aeff5cb1863e0cb731ee4edcf4a2cbc9 /src/yuzu_cmd
parentMerge pull request #3925 from ogniK5377/hid-SendKeyboardLockKeyEvent (diff)
downloadyuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.tar
yuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.tar.gz
yuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.tar.bz2
yuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.tar.lz
yuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.tar.xz
yuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.tar.zst
yuzu-988e42a3f57e427e4f91172086ccc8a9a52f73eb.zip
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/config.cpp5
-rw-r--r--src/yuzu_cmd/default_ini.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 8476a5a16..2348e6e0d 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -367,6 +367,9 @@ void Config::ReadValues() {
Settings::values.custom_rtc = std::nullopt;
}
+ Settings::values.language_index = sdl2_config->GetInteger("System", "language_index", 1);
+ Settings::values.time_zone_index = sdl2_config->GetInteger("System", "time_zone_index", 0);
+
// Core
Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false);
@@ -409,8 +412,6 @@ void Config::ReadValues() {
Settings::values.audio_device_id = sdl2_config->Get("Audio", "output_device", "auto");
Settings::values.volume = static_cast<float>(sdl2_config->GetReal("Audio", "volume", 1));
- Settings::values.language_index = sdl2_config->GetInteger("System", "language_index", 1);
-
// Miscellaneous
Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false);
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 60b1a62fa..ae94b51c4 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -262,6 +262,10 @@ language_index =
# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
region_value =
+# The system time zone that yuzu will use during emulation
+# 0: Auto-select (default), 1: Default (system archive value), Others: Index for specified time zone
+time_zone_index =
+
[Miscellaneous]
# A filter which removes logs below a certain logging level.
# Examples: *:Debug Kernel.SVC:Trace Service.*:Critical