diff options
| author | David <25727384+ogniK5377@users.noreply.github.com> | 2018-10-24 10:28:17 +1100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-10-23 19:28:17 -0400 |
| commit | 50e4e81fd3a998813316cdabd05ef56b12c91fae (patch) | |
| tree | b5b77eec3bdc55b411c04ca6a9d4a44f1e670f9c /src/core/settings.h | |
| parent | 5edb2403c2030162bbb602dfd8289c738acff0e3 (diff) | |
Added Amiibo support (#1390)
* Fixed conflict with nfp
* Few fixups for nfc
* Conflict 2
* Fixed AttachAvailabilityChangeEvent
* Conflict 3
* Fixed byte padding
* Refactored amiibo to not reside in "System"
* Removed remaining references of nfc from system
* used enum for Nfc GetStateOld
* Added missing newline
* Moved file operations to front end
* Conflict 4
* Amiibos now use structs and added mutexes
* Removed amiibo_path
Diffstat (limited to 'src/core/settings.h')
| -rw-r--r-- | src/core/settings.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 8f2da01c8..ca80718e2 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -113,6 +113,7 @@ static const std::array<const char*, NumAnalogs> mapping = {{ struct Values { // System bool use_docked_mode; + bool enable_nfc; std::string username; int language_index; |