piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 9b6555c49c into 2c92e5b5b3

Browse Source
This commit is contained in:
LillyJadeKatrin 2024-11-12 06:26:24 -05:00 committed by GitHub
commit 50ddd0d9b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/AchievementManager.cpp
View File

@ -16,6 +16,7 @@
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/BitUtils.h" #include "Common/BitUtils.h"
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/Config/Config.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IOFile.h" #include "Common/IOFile.h"
#include "Common/Image.h" #include "Common/Image.h"
@ -64,6 +65,7 @@ void AchievementManager::Init()
[](const char* message, const rc_client_t* client) { [](const char* message, const rc_client_t* client) {
INFO_LOG_FMT(ACHIEVEMENTS, "{}", message); INFO_LOG_FMT(ACHIEVEMENTS, "{}", message);
}); });
Config::AddConfigChangedCallback([this] { SetHardcoreMode(); });
SetHardcoreMode(); SetHardcoreMode();
m_queue.Reset("AchievementManagerQueue", [](const std::function<void()>& func) { func(); }); m_queue.Reset("AchievementManagerQueue", [](const std::function<void()>& func) { func(); });
m_image_queue.Reset("AchievementManagerImageQueue", m_image_queue.Reset("AchievementManagerImageQueue",

4
Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp
View File

@ -11,6 +11,7 @@
#include "Common/Config/Config.h" #include "Common/Config/Config.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Core/Config/AchievementSettings.h"
#include "Core/Config/GraphicsSettings.h" #include "Core/Config/GraphicsSettings.h"
#include "Core/Config/MainSettings.h" #include "Core/Config/MainSettings.h"
#include "Core/Config/SYSCONFSettings.h" #include "Core/Config/SYSCONFSettings.h"
@ -33,6 +34,9 @@ public:
layer->Set(Config::MAIN_CPU_THREAD, m_settings.cpu_thread); layer->Set(Config::MAIN_CPU_THREAD, m_settings.cpu_thread);
layer->Set(Config::MAIN_CPU_CORE, m_settings.cpu_core); layer->Set(Config::MAIN_CPU_CORE, m_settings.cpu_core);
layer->Set(Config::MAIN_ENABLE_CHEATS, m_settings.enable_cheats); layer->Set(Config::MAIN_ENABLE_CHEATS, m_settings.enable_cheats);
#ifdef USE_RETRO_ACHIEVEMENTS
layer->Set(Config::RA_HARDCORE_ENABLED, m_settings.enable_hardcore);
#endif // USE_RETRO_ACHIEVEMENTS
layer->Set(Config::MAIN_GC_LANGUAGE, m_settings.selected_language); layer->Set(Config::MAIN_GC_LANGUAGE, m_settings.selected_language);
layer->Set(Config::MAIN_OVERRIDE_REGION_SETTINGS, m_settings.override_region_settings); layer->Set(Config::MAIN_OVERRIDE_REGION_SETTINGS, m_settings.override_region_settings);
layer->Set(Config::MAIN_DSP_HLE, m_settings.dsp_hle); layer->Set(Config::MAIN_DSP_HLE, m_settings.dsp_hle);

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

@ -848,6 +848,7 @@ void NetPlayClient::OnStartGame(sf::Packet& packet)
packet >> m_net_settings.cpu_thread; packet >> m_net_settings.cpu_thread;
packet >> m_net_settings.cpu_core; packet >> m_net_settings.cpu_core;
packet >> m_net_settings.enable_cheats; packet >> m_net_settings.enable_cheats;
packet >> m_net_settings.enable_hardcore;
packet >> m_net_settings.selected_language; packet >> m_net_settings.selected_language;
packet >> m_net_settings.override_region_settings; packet >> m_net_settings.override_region_settings;
packet >> m_net_settings.dsp_enable_jit; packet >> m_net_settings.dsp_enable_jit;

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

@ -35,6 +35,7 @@ struct NetSettings
bool cpu_thread = false; bool cpu_thread = false;
PowerPC::CPUCore cpu_core{}; PowerPC::CPUCore cpu_core{};
bool enable_cheats = false; bool enable_cheats = false;
bool enable_hardcore = false;
int selected_language = 0; int selected_language = 0;
bool override_region_settings = false; bool override_region_settings = false;
bool dsp_hle = false; bool dsp_hle = false;

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

@ -31,6 +31,7 @@
#include "Common/UPnP.h" #include "Common/UPnP.h"
#include "Common/Version.h" #include "Common/Version.h"
#include "Core/AchievementManager.h"
#include "Core/ActionReplay.h" #include "Core/ActionReplay.h"
#include "Core/Boot/Boot.h" #include "Core/Boot/Boot.h"
#include "Core/Config/GraphicsSettings.h" #include "Core/Config/GraphicsSettings.h"
@ -1358,6 +1359,7 @@ bool NetPlayServer::SetupNetSettings()
settings.cpu_thread = Config::Get(Config::MAIN_CPU_THREAD); settings.cpu_thread = Config::Get(Config::MAIN_CPU_THREAD);
settings.cpu_core = Config::Get(Config::MAIN_CPU_CORE); settings.cpu_core = Config::Get(Config::MAIN_CPU_CORE);
settings.enable_cheats = Config::AreCheatsEnabled(); settings.enable_cheats = Config::AreCheatsEnabled();
settings.enable_hardcore = AchievementManager::GetInstance().IsHardcoreModeActive();
settings.selected_language = Config::Get(Config::MAIN_GC_LANGUAGE); settings.selected_language = Config::Get(Config::MAIN_GC_LANGUAGE);
settings.override_region_settings = Config::Get(Config::MAIN_OVERRIDE_REGION_SETTINGS); settings.override_region_settings = Config::Get(Config::MAIN_OVERRIDE_REGION_SETTINGS);
settings.dsp_hle = Config::Get(Config::MAIN_DSP_HLE); settings.dsp_hle = Config::Get(Config::MAIN_DSP_HLE);
@ -1586,6 +1588,7 @@ bool NetPlayServer::StartGame()
spac << m_settings.cpu_thread; spac << m_settings.cpu_thread;
spac << m_settings.cpu_core; spac << m_settings.cpu_core;
spac << m_settings.enable_cheats; spac << m_settings.enable_cheats;
spac << m_settings.enable_hardcore;
spac << m_settings.selected_language; spac << m_settings.selected_language;
spac << m_settings.override_region_settings; spac << m_settings.override_region_settings;
spac << m_settings.dsp_enable_jit; spac << m_settings.dsp_enable_jit;

1
Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
View File

@ -329,7 +329,6 @@ void AchievementSettingsWidget::ToggleProgress()
void AchievementSettingsWidget::UpdateHardcoreMode() void AchievementSettingsWidget::UpdateHardcoreMode()
{ {
AchievementManager::GetInstance().SetHardcoreMode();
if (Config::Get(Config::RA_HARDCORE_ENABLED)) if (Config::Get(Config::RA_HARDCORE_ENABLED))
{ {
Settings::Instance().SetDebugModeEnabled(false); Settings::Instance().SetDebugModeEnabled(false);