diff options
author | bunnei <bunneidev@gmail.com> | 2019-04-01 21:02:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-01 21:02:08 +0200 |
commit | 62860dc0b0e958a3119eb68bd8e005bf54664aab (patch) | |
tree | 47cf8194d8cb3134724b327281e499ae30700ae3 /src/core | |
parent | Merge pull request #2283 from FearlessTobi/port-4517 (diff) | |
parent | core/yuzu: Remove enable_nfc setting (diff) | |
download | yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.tar yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.tar.gz yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.tar.bz2 yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.tar.lz yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.tar.xz yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.tar.zst yuzu-62860dc0b0e958a3119eb68bd8e005bf54664aab.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/service/nfc/nfc.cpp | 2 | ||||
-rw-r--r-- | src/core/settings.cpp | 1 | ||||
-rw-r--r-- | src/core/settings.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 5c62d42ba..ca88bf97f 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -150,7 +150,7 @@ private: IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); - rb.PushRaw<u8>(Settings::values.enable_nfc); + rb.PushRaw<u8>(true); } void GetStateOld(Kernel::HLERequestContext& ctx) { diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 6dd3139cc..6d32ebea3 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -82,7 +82,6 @@ void LogSetting(const std::string& name, const T& value) { void LogSettings() { LOG_INFO(Config, "yuzu Configuration:"); LogSetting("System_UseDockedMode", Settings::values.use_docked_mode); - LogSetting("System_EnableNfc", Settings::values.enable_nfc); LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0)); LogSetting("System_CurrentUser", Settings::values.current_user); LogSetting("System_LanguageIndex", Settings::values.language_index); diff --git a/src/core/settings.h b/src/core/settings.h index cdfb2f742..d543eb32f 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -349,7 +349,6 @@ struct TouchscreenInput { struct Values { // System bool use_docked_mode; - bool enable_nfc; std::optional<u32> rng_seed; // Measured in seconds since epoch std::optional<std::chrono::seconds> custom_rtc; |