diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 71683afd33..11f9f67780 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -215,6 +215,7 @@ bool BootCore(const std::string& _rFilename) StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread; StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard; + StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; SConfig::GetInstance().m_EXIDevice[0] = g_NetPlaySettings.m_EXIDevice[0]; SConfig::GetInstance().m_EXIDevice[1] = g_NetPlaySettings.m_EXIDevice[1]; diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 6ca13b4836..f473cbd22a 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -266,6 +266,7 @@ 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_CPUcore; packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPHLE; packet >> g_NetPlaySettings.m_WriteToMemcard; diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 6fe6899b87..33771c3eae 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -12,6 +12,7 @@ struct NetSettings { bool m_CPUthread; + int m_CPUcore; bool m_DSPHLE; bool m_DSPEnableJIT; bool m_WriteToMemcard; @@ -27,7 +28,7 @@ struct Rpt : public std::vector typedef std::vector NetWiimote; -#define NETPLAY_VERSION "Dolphin NetPlay 2013-09-22" +#define NETPLAY_VERSION "Dolphin NetPlay 2014-01-08" const int NETPLAY_INITIAL_GCTIME = 1272737767; diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 296fcd29a4..3209f6ad28 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -536,6 +536,7 @@ bool NetPlayServer::StartGame(const std::string &path) spac << (MessageId)NP_MSG_START_GAME; spac << m_current_game; spac << m_settings.m_CPUthread; + spac << m_settings.m_CPUcore; spac << m_settings.m_DSPEnableJIT; spac << m_settings.m_DSPHLE; spac << m_settings.m_WriteToMemcard; diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index 79ec2b59a5..1e7b93d17b 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -409,6 +409,7 @@ void NetPlayDiag::GetNetSettings(NetSettings &settings) { SConfig &instance = SConfig::GetInstance(); settings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread; + settings.m_CPUcore = instance.m_LocalCoreStartupParameter.iCPUCore; settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; settings.m_DSPEnableJIT = instance.m_EnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue();