Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replay: Handle long button presses correctly.

Browse source
This commit is contained in:
Unknown W. Brackets 2018-04-07 18:00:08 -07:00
parent 3ea652714a
commit 462d4d648e
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/Replay.cpp
View file

@ -268,17 +268,20 @@ static void ReplaySaveCtrl(uint32_t &buttons, uint8_t analog[2][2], uint64_t t)
}
static void ReplayExecuteCtrl(uint32_t &buttons, uint8_t analog[2][2], uint64_t t) {
if (replayCtrlPos >= replayItems.size()) {
// Don't assert buttons, let the user input prevail.
return;
}
for (; replayCtrlPos < replayItems.size() && t >= replayItems[replayCtrlPos].info.timestamp; ++replayCtrlPos) {
const auto &item = replayItems[replayCtrlPos];
switch (item.info.action) {
case ReplayAction::BUTTONS:
buttons = item.info.buttons;
lastButtons = item.info.buttons;
break;
case ReplayAction::ANALOG:
memcpy(analog, item.info.analog, sizeof(analog));
memcpy(lastAnalog, item.info.analog, sizeof(analog));
memcpy(lastAnalog, item.info.analog, sizeof(lastAnalog));
break;
default:
@ -287,6 +290,10 @@ static void ReplayExecuteCtrl(uint32_t &buttons, uint8_t analog[2][2], uint64_t
}
}
// We have to always apply the latest state here, because otherwise real input is used between changes.
buttons = lastButtons;
memcpy(analog, lastAnalog, sizeof(analog));
if (replayExecPos < replayCtrlPos) {
replayExecPos = replayCtrlPos;
}