ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't sync dual core setting in netplay.

This commit is contained in:
Rachel Bryk 2013-07-20 13:20:14 -04:00
parent 96219df4fd
commit 41fe2e1466
5 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/BootManager.cpp
View File

@ -138,7 +138,6 @@ bool BootCore(const std::string& _rFilename)
if (NetPlay::GetNetPlayPtr()) if (NetPlay::GetNetPlayPtr())
{ {
StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
} }

1
Source/Core/Core/Src/NetPlay.cpp
View File

@ -286,7 +286,6 @@ u8 NetPlay::GetPadNum(u8 numPAD)
void NetPlay::GetNetSettings() void NetPlay::GetNetSettings()
{ {
SConfig &instance = SConfig::GetInstance(); SConfig &instance = SConfig::GetInstance();
g_NetPlaySettings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread;
g_NetPlaySettings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; g_NetPlaySettings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
g_NetPlaySettings.m_DSPEnableJIT = instance.m_EnableJIT; g_NetPlaySettings.m_DSPEnableJIT = instance.m_EnableJIT;

1
Source/Core/Core/Src/NetPlay.h
View File

@ -33,7 +33,6 @@ public:
struct NetSettings struct NetSettings
{ {
bool m_CPUthread;
bool m_DSPHLE; bool m_DSPHLE;
bool m_DSPEnableJIT; bool m_DSPEnableJIT;
u8 m_Controllers[4]; u8 m_Controllers[4];

1
Source/Core/Core/Src/NetPlayClient.cpp
View File

@ -193,7 +193,6 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
{ {
std::lock_guard<std::recursive_mutex> lkg(m_crit.game); std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
packet >> m_current_game; packet >> m_current_game;
packet >> g_NetPlaySettings.m_CPUthread;
packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPEnableJIT;
packet >> g_NetPlaySettings.m_DSPHLE; packet >> g_NetPlaySettings.m_DSPHLE;
for (unsigned int i = 0; i < 4; ++i) for (unsigned int i = 0; i < 4; ++i)

1
Source/Core/Core/Src/NetPlayServer.cpp
View File

@ -604,7 +604,6 @@ bool NetPlayServer::StartGame(const std::string &path)
sf::Packet spac; sf::Packet spac;
spac << (MessageId)NP_MSG_START_GAME; spac << (MessageId)NP_MSG_START_GAME;
spac << NetPlay::m_current_game; spac << NetPlay::m_current_game;
spac << g_NetPlaySettings.m_CPUthread;
spac << g_NetPlaySettings.m_DSPEnableJIT; spac << g_NetPlaySettings.m_DSPEnableJIT;
spac << g_NetPlaySettings.m_DSPHLE; spac << g_NetPlaySettings.m_DSPHLE;
for (unsigned int i = 0; i < 4; ++i) for (unsigned int i = 0; i < 4; ++i)