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/yuzu/main.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/yuzu/main.h')
-rw-r--r-- | src/yuzu/main.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/yuzu/main.h b/src/yuzu/main.h index c8cbc0ba8..7c7c223e1 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -166,6 +166,7 @@ private slots: void OnMenuSelectEmulatedDirectory(EmulatedDirectoryTarget target); void OnMenuRecentFile(); void OnConfigure(); + void OnLoadAmiibo(); void OnAbout(); void OnToggleFilterBar(); void OnDisplayTitleBars(bool); |