diff options
author | liamwhite <[email protected]> | 2024-02-24 12:48:31 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2024-02-24 12:48:31 -0500 |
commit | 05f94dc5fc2a23757c91d7966541499912237e68 (patch) | |
tree | eb144d28252a377ac12f4cde2d50440e945489fe | |
parent | dcf7698924867dbf1fffd0e0cf9f91dd1f7323a9 (diff) | |
parent | 4741e5004713695e04e726ab54f7204b4fce5db9 (diff) | |
download | yuzu-mainline-05f94dc5fc2a23757c91d7966541499912237e68.tar.gz yuzu-mainline-05f94dc5fc2a23757c91d7966541499912237e68.zip |
Merge pull request #13153 from german77/defaultset
service: set: Enable nfc and others by default and bump version
-rw-r--r-- | src/core/hle/service/set/setting_formats/system_settings.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/set/system_settings_server.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/service/set/setting_formats/system_settings.cpp b/src/core/hle/service/set/setting_formats/system_settings.cpp index 7231ff78e..caa30c2d5 100644 --- a/src/core/hle/service/set/setting_formats/system_settings.cpp +++ b/src/core/hle/service/set/setting_formats/system_settings.cpp @@ -52,6 +52,10 @@ SystemSettings DefaultSystemSettings() { settings.battery_percentage_flag = true; settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0; settings.vibration_master_volume = 1.0f; + settings.touch_screen_mode = TouchScreenMode::Standard; + settings.nfc_enable_flag = true; + settings.bluetooth_enable_flag = true; + settings.wireless_lan_enable_flag = true; const auto language_code = available_language_codes[static_cast<s32>(::Settings::values.language_index.GetValue())]; diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index a4475441e..6a7ea83fd 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -26,7 +26,7 @@ namespace Service::Set { namespace { -constexpr u32 SETTINGS_VERSION{3u}; +constexpr u32 SETTINGS_VERSION{4u}; constexpr auto SETTINGS_MAGIC = Common::MakeMagic('y', 'u', 'z', 'u', '_', 's', 'e', 't'); struct SettingsHeader { u64 magic; |