diff --git a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp b/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp index 280a85e465..35bc93e2fb 100644 --- a/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp +++ b/Source/Core/Core/HW/SI_DeviceGCAdapter.cpp @@ -8,6 +8,7 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/HW/GCPad.h" #include "Core/HW/SI_DeviceGCAdapter.h" #include "Core/NetPlayProto.h" @@ -41,12 +42,11 @@ GCPadStatus CSIDevice_GCAdapter::GetPadStatus() int CSIDevice_GCAdapter::RunBuffer(u8* buffer, int length) { - if (!NetPlay::IsNetPlayRunning()) + if (!Core::g_want_determinism) { - // The previous check is a hack to prevent a netplay desync due to - // SI devices being different and returning different values on - // RunBuffer(); the corresponding code in GCAdapter.cpp has the same - // check. + // The previous check is a hack to prevent a desync due to SI devices + // being different and returning different values on RunBuffer(); + // the corresponding code in GCAdapter.cpp has the same check. // This returns an error value if there is no controller plugged // into this port on the hardware gc adapter, exposing it to the game. diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index b86b0aa4c5..7c450d4288 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -453,9 +453,9 @@ void Input(int chan, GCPadStatus* pad) pad->triggerLeft = controller_payload_copy[1 + (9 * chan) + 7]; pad->triggerRight = controller_payload_copy[1 + (9 * chan) + 8]; } - else if (!NetPlay::IsNetPlayRunning()) + else if (!Core::g_want_determinism) { - // This is a hack to prevent a netplay desync due to SI devices + // This is a hack to prevent a desync due to SI devices // being different and returning different values. // The corresponding code in DeviceGCAdapter has the same check pad->button = PAD_ERR_STATUS;