octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Luigi's Mansion can't remove amiibo bug (#5200) 

* Fix Luigi's Mansion can't remove amiibo bug
This commit is contained in:
Valentin Vanelslande 2020-04-14 07:33:49 -05:00 committed by GitHub
parent 45dfb3aacc
commit 263e5be78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/nfc/nfc.cpp
View File

@ -323,10 +323,12 @@ void Module::SyncTagState() {
// detected on Scanning->TagInRange? // detected on Scanning->TagInRange?
nfc_tag_state = TagState::TagInRange; nfc_tag_state = TagState::TagInRange;
tag_in_range_event->Signal(); tag_in_range_event->Signal();
} else if (!amiibo_in_range && nfc_tag_state == TagState::TagInRange) { } else if (!amiibo_in_range &&
nfc_tag_state = TagState::TagOutOfRange; (nfc_tag_state == TagState::TagInRange || nfc_tag_state == TagState::TagDataLoaded ||
nfc_tag_state == TagState::Unknown6)) {
// TODO (wwylele): If a tag is removed during TagDataLoaded/Unknown6, should this event // TODO (wwylele): If a tag is removed during TagDataLoaded/Unknown6, should this event
// signals early? // signals early?
nfc_tag_state = TagState::TagOutOfRange;
tag_out_of_range_event->Signal(); tag_out_of_range_event->Signal();
} }
} }