Use g_want_determinism in code added by 8f0cbef

There's no reason this only should apply to netplay.
dolphin-emu · Jul 5, 2016 · d6acb7b · d6acb7b
1 parent 6951228
commit d6acb7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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,7 +42,7 @@ 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

diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
@@ -453,7 +453,7 @@ 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
       // being different and returning different values.