The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-30 05:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only initialise maxEntry for active input devices

Browse Source 
This caused the menus in Sonic Mania to be nonfunctional, futhermore,
default init is not ran for the input structs so the default max
definition in CommonHeader never actually applied.
This commit is contained in:
Billy Laws 2020-11-20 20:30:13 +00:00 committed by ◱ PixelyIon
parent bc5c094860
commit 7167393e3c
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/cpp/skyline/input/npad_device.cpp
View File

@ -187,6 +187,7 @@ namespace skyline::input {
info.header.timestamp = util::GetTimeTicks(); info.header.timestamp = util::GetTimeTicks();
info.header.entryCount = std::min(static_cast<u8>(info.header.entryCount + 1), constant::HidEntryCount); info.header.entryCount = std::min(static_cast<u8>(info.header.entryCount + 1), constant::HidEntryCount);
info.header.maxEntry = constant::HidEntryCount - 1;
info.header.currentEntry = (info.header.currentEntry != constant::HidEntryCount - 1) ? info.header.currentEntry + 1 : 0; info.header.currentEntry = (info.header.currentEntry != constant::HidEntryCount - 1) ? info.header.currentEntry + 1 : 0;
auto &entry{info.state.at(info.header.currentEntry)}; auto &entry{info.state.at(info.header.currentEntry)};

2
app/src/main/cpp/skyline/input/sections/common.h
View File

@ -21,7 +21,7 @@ namespace skyline {
u64 timestamp; //!< The timestamp of the latest entry in ticks u64 timestamp; //!< The timestamp of the latest entry in ticks
u64 entryCount; //!< The number of written entries u64 entryCount; //!< The number of written entries
u64 currentEntry; //!< The index of the latest entry u64 currentEntry; //!< The index of the latest entry
u64 maxEntry{constant::HidEntryCount - 1}; //!< The maximum entry index (16) u64 maxEntry; //!< The maximum entry index
}; };
static_assert(sizeof(CommonHeader) == 0x20); static_assert(sizeof(CommonHeader) == 0x20);
} }

1
app/src/main/cpp/skyline/input/touch.cpp
View File

@ -37,6 +37,7 @@ namespace skyline::input {
section.header.timestamp = util::GetTimeTicks(); section.header.timestamp = util::GetTimeTicks();
section.header.entryCount = std::min(static_cast<u8>(section.header.entryCount + 1), constant::HidEntryCount); section.header.entryCount = std::min(static_cast<u8>(section.header.entryCount + 1), constant::HidEntryCount);
section.header.maxEntry = constant::HidEntryCount - 1;
section.header.currentEntry = entryIndex; section.header.currentEntry = entryIndex;
} }
} }