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

Sync the "enable cheat" setting over netplay

This commit is contained in:
mathieui 2016-06-02 22:56:15 +02:00
parent b33a5e2510
commit 8a2e7fddd1
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,6 +347,7 @@ bool BootCore(const std::string& _rFilename)
if (NetPlay::IsNetPlayRunning()) if (NetPlay::IsNetPlayRunning())
{ {
StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread; StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
StartUp.bEnableCheats = g_NetPlaySettings.m_enableCheats;
StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
StartUp.bEnableMemcardSdWriting = g_NetPlaySettings.m_WriteToMemcard; StartUp.bEnableMemcardSdWriting = g_NetPlaySettings.m_WriteToMemcard;
StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore; StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore;

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

@ -367,6 +367,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
packet >> m_current_game; packet >> m_current_game;
packet >> g_NetPlaySettings.m_CPUthread; packet >> g_NetPlaySettings.m_CPUthread;
packet >> g_NetPlaySettings.m_CPUcore; packet >> g_NetPlaySettings.m_CPUcore;
packet >> g_NetPlaySettings.m_enableCheats;
packet >> g_NetPlaySettings.m_SelectedLanguage; packet >> g_NetPlaySettings.m_SelectedLanguage;
packet >> g_NetPlaySettings.m_OverrideGCLanguage; packet >> g_NetPlaySettings.m_OverrideGCLanguage;
packet >> g_NetPlaySettings.m_ProgressiveScan; packet >> g_NetPlaySettings.m_ProgressiveScan;

1
Source/Core/Core/NetPlayProto.h
View File

@ -13,6 +13,7 @@ struct NetSettings
{ {
bool m_CPUthread; bool m_CPUthread;
int m_CPUcore; int m_CPUcore;
bool m_enableCheats;
int m_SelectedLanguage; int m_SelectedLanguage;
bool m_OverrideGCLanguage; bool m_OverrideGCLanguage;
bool m_ProgressiveScan; bool m_ProgressiveScan;

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

@ -712,6 +712,7 @@ bool NetPlayServer::StartGame()
*spac << m_current_game; *spac << m_current_game;
*spac << m_settings.m_CPUthread; *spac << m_settings.m_CPUthread;
*spac << m_settings.m_CPUcore; *spac << m_settings.m_CPUcore;
*spac << m_settings.m_enableCheats;
*spac << m_settings.m_SelectedLanguage; *spac << m_settings.m_SelectedLanguage;
*spac << m_settings.m_OverrideGCLanguage; *spac << m_settings.m_OverrideGCLanguage;
*spac << m_settings.m_ProgressiveScan; *spac << m_settings.m_ProgressiveScan;

1
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -274,6 +274,7 @@ void NetPlayDialog::GetNetSettings(NetSettings& settings)
SConfig& instance = SConfig::GetInstance(); SConfig& instance = SConfig::GetInstance();
settings.m_CPUthread = instance.bCPUThread; settings.m_CPUthread = instance.bCPUThread;
settings.m_CPUcore = instance.iCPUCore; settings.m_CPUcore = instance.iCPUCore;
settings.m_enableCheats = instance.bEnableCheats;
settings.m_SelectedLanguage = instance.SelectedLanguage; settings.m_SelectedLanguage = instance.SelectedLanguage;
settings.m_OverrideGCLanguage = instance.bOverrideGCLanguage; settings.m_OverrideGCLanguage = instance.bOverrideGCLanguage;
settings.m_ProgressiveScan = instance.bProgressive; settings.m_ProgressiveScan = instance.bProgressive;