From 8a2e7fddd178b7b1809878e09049818276b2151c Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 2 Jun 2016 22:56:15 +0200 Subject: [PATCH 1/2] Sync the "enable cheat" setting over netplay --- Source/Core/Core/BootManager.cpp | 1 + Source/Core/Core/NetPlayClient.cpp | 1 + Source/Core/Core/NetPlayProto.h | 1 + Source/Core/Core/NetPlayServer.cpp | 1 + Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 912d056bea..2ec228ff4d 100644 --- a/Source/Core/Core/BootManager.cpp +++ b/Source/Core/Core/BootManager.cpp @@ -347,6 +347,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..076f127acc 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..1bd0211074 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..9130bfd291 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..a1a5e506b5 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; From d6a2fcd26c821d795209c4fefa088f2f0ff15a81 Mon Sep 17 00:00:00 2001 From: JDV Date: Mon, 4 Jul 2016 17:48:04 -0600 Subject: [PATCH 2/2] Formatting and setting is now only temporarily changed (#1) Add the cheat setting to the bootmanager config cache, and reformat --- Source/Core/Core/BootManager.cpp | 6 +++++- Source/Core/Core/NetPlayClient.cpp | 2 +- Source/Core/Core/NetPlayProto.h | 2 +- Source/Core/Core/NetPlayServer.cpp | 2 +- Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp index 2ec228ff4d..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,7 +351,7 @@ bool BootCore(const std::string& _rFilename) if (NetPlay::IsNetPlayRunning()) { StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread; - StartUp.bEnableCheats = g_NetPlaySettings.m_enableCheats; + 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 076f127acc..f2f9f3ace6 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -367,7 +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_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 1bd0211074..1e75f46c38 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -13,7 +13,7 @@ struct NetSettings { bool m_CPUthread; int m_CPUcore; - bool m_enableCheats; + 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 9130bfd291..a207432761 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -712,7 +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_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 a1a5e506b5..43a96404c7 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -274,7 +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_EnableCheats = instance.bEnableCheats; settings.m_SelectedLanguage = instance.SelectedLanguage; settings.m_OverrideGCLanguage = instance.bOverrideGCLanguage; settings.m_ProgressiveScan = instance.bProgressive;