From 41fe2e1466d1e8939b2716c686d094112753a703 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 20 Jul 2013 13:20:14 -0400 Subject: [PATCH] Don't sync dual core setting in netplay. --- Source/Core/Core/Src/BootManager.cpp | 1 - Source/Core/Core/Src/NetPlay.cpp | 1 - Source/Core/Core/Src/NetPlay.h | 1 - Source/Core/Core/Src/NetPlayClient.cpp | 1 - Source/Core/Core/Src/NetPlayServer.cpp | 1 - 5 files changed, 5 deletions(-) diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp index 871af5059c..60f718db53 100644 --- a/Source/Core/Core/Src/BootManager.cpp +++ b/Source/Core/Core/Src/BootManager.cpp @@ -138,7 +138,6 @@ bool BootCore(const std::string& _rFilename) if (NetPlay::GetNetPlayPtr()) { - StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread; StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; } diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp index 48eb6f5cad..59b6a05538 100644 --- a/Source/Core/Core/Src/NetPlay.cpp +++ b/Source/Core/Core/Src/NetPlay.cpp @@ -286,7 +286,6 @@ u8 NetPlay::GetPadNum(u8 numPAD) void NetPlay::GetNetSettings() { SConfig &instance = SConfig::GetInstance(); - g_NetPlaySettings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread; g_NetPlaySettings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; g_NetPlaySettings.m_DSPEnableJIT = instance.m_EnableJIT; diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h index d8ecee016a..8b84f43250 100644 --- a/Source/Core/Core/Src/NetPlay.h +++ b/Source/Core/Core/Src/NetPlay.h @@ -33,7 +33,6 @@ public: struct NetSettings { - bool m_CPUthread; bool m_DSPHLE; bool m_DSPEnableJIT; u8 m_Controllers[4]; diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp index c72c94efa4..f01f2155c6 100644 --- a/Source/Core/Core/Src/NetPlayClient.cpp +++ b/Source/Core/Core/Src/NetPlayClient.cpp @@ -193,7 +193,6 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet) { std::lock_guard lkg(m_crit.game); packet >> m_current_game; - packet >> g_NetPlaySettings.m_CPUthread; packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPHLE; for (unsigned int i = 0; i < 4; ++i) diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp index d19b6d684a..31731daa47 100644 --- a/Source/Core/Core/Src/NetPlayServer.cpp +++ b/Source/Core/Core/Src/NetPlayServer.cpp @@ -604,7 +604,6 @@ bool NetPlayServer::StartGame(const std::string &path) sf::Packet spac; spac << (MessageId)NP_MSG_START_GAME; spac << NetPlay::m_current_game; - spac << g_NetPlaySettings.m_CPUthread; spac << g_NetPlaySettings.m_DSPEnableJIT; spac << g_NetPlaySettings.m_DSPHLE; for (unsigned int i = 0; i < 4; ++i)