Merge pull request #3878 from mathieui/enable-cheats-for-jmc-the-cheater

Sync the "enable cheat" setting over netplay

5 files changed, 9 insertions, 0 deletions

diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 912d056bea..f443491dfc 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -63,6 +63,7 @@ public:
 private:
   bool valid;
   bool bCPUThread;
+  bool bEnableCheats;
   bool bSkipIdle;
   bool bSyncGPUOnSkipIdleHack;
   bool bFPRF;
@@ -94,6 +95,7 @@ void ConfigCache::SaveConfig(const SConfig& config)
   valid = true;
 
   bCPUThread = config.bCPUThread;
+  bEnableCheats = config.bEnableCheats;
   bSkipIdle = config.bSkipIdle;
   bSyncGPUOnSkipIdleHack = config.bSyncGPUOnSkipIdleHack;
   bFPRF = config.bFPRF;
@@ -136,6 +138,7 @@ void ConfigCache::RestoreConfig(SConfig* config)
   valid = false;
 
   config->bCPUThread = bCPUThread;
+  config->bEnableCheats = bEnableCheats;
   config->bSkipIdle = bSkipIdle;
   config->bSyncGPUOnSkipIdleHack = bSyncGPUOnSkipIdleHack;
   config->bFPRF = bFPRF;
@@ -245,6 +248,7 @@ bool BootCore(const std::string& _rFilename)
     IniFile::Section* controls_section = game_ini.GetOrCreateSection("Controls");
 
     core_section->Get("CPUThread", &StartUp.bCPUThread, StartUp.bCPUThread);
+    core_section->Get("EnableCheats", &StartUp.bEnableCheats, StartUp.bEnableCheats);
     core_section->Get("SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);
     core_section->Get("SyncOnSkipIdle", &StartUp.bSyncGPUOnSkipIdleHack,
                       StartUp.bSyncGPUOnSkipIdleHack);
@@ -347,6 +351,7 @@ bool BootCore(const std::string& _rFilename)
   if (NetPlay::IsNetPlayRunning())
   {
     StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
+    StartUp.bEnableCheats = g_NetPlaySettings.m_EnableCheats;
     StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
     StartUp.bEnableMemcardSdWriting = g_NetPlaySettings.m_WriteToMemcard;
     StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore;
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 9170b2b03d..f2f9f3ace6 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -367,6 +367,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
       packet >> m_current_game;
       packet >> g_NetPlaySettings.m_CPUthread;
       packet >> g_NetPlaySettings.m_CPUcore;
+      packet >> g_NetPlaySettings.m_EnableCheats;
       packet >> g_NetPlaySettings.m_SelectedLanguage;
       packet >> g_NetPlaySettings.m_OverrideGCLanguage;
       packet >> g_NetPlaySettings.m_ProgressiveScan;
diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h
index 09451b9b76..1e75f46c38 100644
--- a/Source/Core/Core/NetPlayProto.h
+++ b/Source/Core/Core/NetPlayProto.h
@@ -13,6 +13,7 @@ struct NetSettings
 {
   bool m_CPUthread;
   int m_CPUcore;
+  bool m_EnableCheats;
   int m_SelectedLanguage;
   bool m_OverrideGCLanguage;
   bool m_ProgressiveScan;
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index d21b0e86fd..a207432761 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -712,6 +712,7 @@ bool NetPlayServer::StartGame()
   *spac << m_current_game;
   *spac << m_settings.m_CPUthread;
   *spac << m_settings.m_CPUcore;
+  *spac << m_settings.m_EnableCheats;
   *spac << m_settings.m_SelectedLanguage;
   *spac << m_settings.m_OverrideGCLanguage;
   *spac << m_settings.m_ProgressiveScan;
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
index 53114a7509..43a96404c7 100644
--- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
+++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
@@ -274,6 +274,7 @@ void NetPlayDialog::GetNetSettings(NetSettings& settings)
   SConfig& instance = SConfig::GetInstance();
   settings.m_CPUthread = instance.bCPUThread;
   settings.m_CPUcore = instance.iCPUCore;
+  settings.m_EnableCheats = instance.bEnableCheats;
   settings.m_SelectedLanguage = instance.SelectedLanguage;
   settings.m_OverrideGCLanguage = instance.bOverrideGCLanguage;
   settings.m_ProgressiveScan = instance.bProgressive;