Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pad: Fix controller state not being ignored in state load

Browse source
This commit is contained in:
Connor McLaughlin 2020-11-21 13:54:31 +10:00
parent 53f81d067a
commit 125d104df4
1 changed files with 46 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/core/pad.cpp
View file

@ -54,49 +54,66 @@ bool Pad::DoState(StateWrapper& sw)
ControllerType state_controller_type = controller_type; ControllerType state_controller_type = controller_type;
sw.Do(&state_controller_type); sw.Do(&state_controller_type);
if (controller_type != state_controller_type) if (g_settings.load_devices_from_save_states)
{ {
if (g_settings.load_devices_from_save_states) if (controller_type != state_controller_type)
{ {
g_host_interface->AddFormattedOSDMessage( if (g_settings.load_devices_from_save_states)
10.0f,
g_host_interface->TranslateString(
"OSDMessage", "Save state contains controller type %s in port %u, but %s is used. Switching."),
Settings::GetControllerTypeName(state_controller_type), i + 1u,
Settings::GetControllerTypeName(controller_type));
m_controllers[i].reset();
if (state_controller_type != ControllerType::None)
{ {
m_controllers[i] = Controller::Create(state_controller_type, i); g_host_interface->AddFormattedOSDMessage(
if (!sw.DoMarker("Controller") || !m_controllers[i]->DoState(sw)) 10.0f,
return false; g_host_interface->TranslateString(
"OSDMessage", "Save state contains controller type %s in port %u, but %s is used. Switching."),
Settings::GetControllerTypeName(state_controller_type), i + 1u,
Settings::GetControllerTypeName(controller_type));
m_controllers[i].reset();
if (state_controller_type != ControllerType::None)
{
m_controllers[i] = Controller::Create(state_controller_type, i);
if (!sw.DoMarker("Controller") || !m_controllers[i]->DoState(sw))
return false;
}
}
else
{
g_host_interface->AddFormattedOSDMessage(
10.0f,
g_host_interface->TranslateString("OSDMessage", "Ignoring mismatched controller type %s in port %u."),
Settings::GetControllerTypeName(state_controller_type), i + 1u);
// we still need to read the save state controller state
if (state_controller_type != ControllerType::None)
{
std::unique_ptr<Controller> dummy_controller = Controller::Create(state_controller_type, i);
if (dummy_controller)
{
if (!sw.DoMarker("Controller") || !dummy_controller->DoState(sw))
return false;
}
}
} }
} }
else else
{ {
g_host_interface->AddFormattedOSDMessage( if (m_controllers[i])
10.0f, g_host_interface->TranslateString("OSDMessage", "Ignoring mismatched controller type %s in port %u."),
Settings::GetControllerTypeName(state_controller_type), i + 1u);
// we still need to read the save state controller state
if (state_controller_type != ControllerType::None)
{ {
std::unique_ptr<Controller> dummy_controller = Controller::Create(state_controller_type, i); if (!sw.DoMarker("Controller") || !m_controllers[i]->DoState(sw))
if (dummy_controller) return false;
{
if (!sw.DoMarker("Controller") || !dummy_controller->DoState(sw))
return false;
}
} }
} }
} }
else else
{ {
if (m_controllers[i]) // we still need to read the save state controller state
if (state_controller_type != ControllerType::None)
{ {
if (!sw.DoMarker("Controller") || !m_controllers[i]->DoState(sw)) std::unique_ptr<Controller> dummy_controller = Controller::Create(state_controller_type, i);
return false; if (dummy_controller)
{
if (!sw.DoMarker("Controller") || !dummy_controller->DoState(sw))
return false;
}
} }
} }