sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Controller: Always preserve internal state when loading/resuming

Browse Source 
Fixes analog mode getting disabled when loading state.
This commit is contained in:
Connor McLaughlin
2020-12-17 00:09:32 +10:00
parent b78a6045fc
commit 47f0720b93
15 changed files with 99 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/analog_joystick.cpp
View File

@ -26,16 +26,26 @@ void AnalogJoystick::Reset()
m_transfer_state = TransferState::Idle;
}
bool AnalogJoystick::DoState(StateWrapper& sw)
bool AnalogJoystick::DoState(StateWrapper& sw, bool apply_input_state)
{
if (!Controller::DoState(sw))
if (!Controller::DoState(sw, apply_input_state))
return false;
const bool old_analog_mode = m_analog_mode;
sw.Do(&m_analog_mode);
sw.Do(&m_button_state);
sw.Do(&m_axis_state);
u16 button_state = m_button_state;
auto axis_state = m_axis_state;
sw.Do(&button_state);
sw.Do(&axis_state);
if (apply_input_state)
{
m_button_state = button_state;
m_axis_state = axis_state;
}
sw.Do(&m_transfer_state);
if (sw.IsReading() && (old_analog_mode != m_analog_mode))