summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
diff options
context:
space:
mode:
authorTechjar <tecknojar@gmail.com>2021-05-17 06:11:02 -0400
committerTechjar <tecknojar@gmail.com>2021-05-19 06:34:24 -0400
commit171aad50ccee326052ff2304af3c31a9cbe653a2 (patch)
treee60f65329563014e903e630df40c07901b8fc157 /Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
parent8ecc89ffe15fa1bed3c481161e6f8287898d227c (diff)
NetPlay: Move NetSettings initialization to backend
It doesn't really belong in frontend code, and this change will make it easier to eventually support NetPlay on other UI frameworks.
Diffstat (limited to 'Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp')
-rw-r--r--Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp99
1 files changed, 0 insertions, 99 deletions
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
index 7a51692dc9..94b4073c71 100644
--- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
@@ -34,8 +34,6 @@
#include "Core/Config/GraphicsSettings.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/NetplaySettings.h"
-#include "Core/Config/SYSCONFSettings.h"
-#include "Core/ConfigLoaders/GameConfigLoader.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/NetPlayServer.h"
@@ -432,103 +430,6 @@ void NetPlayDialog::OnStart()
return;
}
- NetPlay::NetSettings settings;
-
- // Load GameINI so we can sync the settings from it
- Config::AddLayer(
- ConfigLoaders::GenerateGlobalGameConfigLoader(game->GetGameID(), game->GetRevision()));
- Config::AddLayer(
- ConfigLoaders::GenerateLocalGameConfigLoader(game->GetGameID(), game->GetRevision()));
-
- // Copy all relevant settings
- settings.m_CPUthread = Config::Get(Config::MAIN_CPU_THREAD);
- settings.m_CPUcore = Config::Get(Config::MAIN_CPU_CORE);
- settings.m_EnableCheats = Config::Get(Config::MAIN_ENABLE_CHEATS);
- settings.m_SelectedLanguage = Config::Get(Config::MAIN_GC_LANGUAGE);
- settings.m_OverrideRegionSettings = Config::Get(Config::MAIN_OVERRIDE_REGION_SETTINGS);
- settings.m_DSPHLE = Config::Get(Config::MAIN_DSP_HLE);
- settings.m_DSPEnableJIT = Config::Get(Config::MAIN_DSP_JIT);
- settings.m_WriteToMemcard = m_save_sd_action->isChecked();
- settings.m_Mem1Size = Config::Get(Config::MAIN_MEM1_SIZE);
- settings.m_Mem2Size = Config::Get(Config::MAIN_MEM2_SIZE);
- settings.m_FallbackRegion = Config::Get(Config::MAIN_FALLBACK_REGION);
- settings.m_CopyWiiSave = m_load_wii_action->isChecked();
- settings.m_OCEnable = Config::Get(Config::MAIN_OVERCLOCK_ENABLE);
- settings.m_OCFactor = Config::Get(Config::MAIN_OVERCLOCK);
- settings.m_EXIDevice[0] =
- static_cast<ExpansionInterface::TEXIDevices>(Config::Get(Config::MAIN_SLOT_A));
- settings.m_EXIDevice[1] =
- static_cast<ExpansionInterface::TEXIDevices>(Config::Get(Config::MAIN_SLOT_B));
- // There's no way the BBA is going to sync, disable it
- settings.m_EXIDevice[2] = ExpansionInterface::EXIDEVICE_NONE;
-
- for (size_t i = 0; i < Config::SYSCONF_SETTINGS.size(); ++i)
- {
- std::visit(
- [&](auto* info) {
- static_assert(sizeof(info->GetDefaultValue()) <= sizeof(u32));
- settings.m_SYSCONFSettings[i] = static_cast<u32>(Config::Get(*info));
- },
- Config::SYSCONF_SETTINGS[i].config_info);
- }
-
- settings.m_EFBAccessEnable = Config::Get(Config::GFX_HACK_EFB_ACCESS_ENABLE);
- settings.m_BBoxEnable = Config::Get(Config::GFX_HACK_BBOX_ENABLE);
- settings.m_ForceProgressive = Config::Get(Config::GFX_HACK_FORCE_PROGRESSIVE);
- settings.m_EFBToTextureEnable = Config::Get(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM);
- settings.m_XFBToTextureEnable = Config::Get(Config::GFX_HACK_SKIP_XFB_COPY_TO_RAM);
- settings.m_DisableCopyToVRAM = Config::Get(Config::GFX_HACK_DISABLE_COPY_TO_VRAM);
- settings.m_ImmediateXFBEnable = Config::Get(Config::GFX_HACK_IMMEDIATE_XFB);
- settings.m_EFBEmulateFormatChanges = Config::Get(Config::GFX_HACK_EFB_EMULATE_FORMAT_CHANGES);
- settings.m_SafeTextureCacheColorSamples =
- Config::Get(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES);
- settings.m_PerfQueriesEnable = Config::Get(Config::GFX_PERF_QUERIES_ENABLE);
- settings.m_FPRF = Config::Get(Config::MAIN_FPRF);
- settings.m_AccurateNaNs = Config::Get(Config::MAIN_ACCURATE_NANS);
- settings.m_DisableICache = Config::Get(Config::MAIN_DISABLE_ICACHE);
- settings.m_SyncOnSkipIdle = Config::Get(Config::MAIN_SYNC_ON_SKIP_IDLE);
- settings.m_SyncGPU = Config::Get(Config::MAIN_SYNC_GPU);
- settings.m_SyncGpuMaxDistance = Config::Get(Config::MAIN_SYNC_GPU_MAX_DISTANCE);
- settings.m_SyncGpuMinDistance = Config::Get(Config::MAIN_SYNC_GPU_MIN_DISTANCE);
- settings.m_SyncGpuOverclock = Config::Get(Config::MAIN_SYNC_GPU_OVERCLOCK);
- settings.m_JITFollowBranch = Config::Get(Config::MAIN_JIT_FOLLOW_BRANCH);
- settings.m_FastDiscSpeed = Config::Get(Config::MAIN_FAST_DISC_SPEED);
- settings.m_MMU = Config::Get(Config::MAIN_MMU);
- settings.m_Fastmem = Config::Get(Config::MAIN_FASTMEM);
- settings.m_SkipIPL = Config::Get(Config::MAIN_SKIP_IPL) ||
- !Settings::Instance().GetNetPlayServer()->DoAllPlayersHaveIPLDump();
- settings.m_LoadIPLDump = Config::Get(Config::MAIN_LOAD_IPL_DUMP) &&
- Settings::Instance().GetNetPlayServer()->DoAllPlayersHaveIPLDump();
- settings.m_VertexRounding = Config::Get(Config::GFX_HACK_VERTEX_ROUDING);
- settings.m_InternalResolution = Config::Get(Config::GFX_EFB_SCALE);
- settings.m_EFBScaledCopy = Config::Get(Config::GFX_HACK_COPY_EFB_SCALED);
- settings.m_FastDepthCalc = Config::Get(Config::GFX_FAST_DEPTH_CALC);
- settings.m_EnablePixelLighting = Config::Get(Config::GFX_ENABLE_PIXEL_LIGHTING);
- settings.m_WidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK);
- settings.m_ForceFiltering = Config::Get(Config::GFX_ENHANCE_FORCE_FILTERING);
- settings.m_MaxAnisotropy = Config::Get(Config::GFX_ENHANCE_MAX_ANISOTROPY);
- settings.m_ForceTrueColor = Config::Get(Config::GFX_ENHANCE_FORCE_TRUE_COLOR);
- settings.m_DisableCopyFilter = Config::Get(Config::GFX_ENHANCE_DISABLE_COPY_FILTER);
- settings.m_DisableFog = Config::Get(Config::GFX_DISABLE_FOG);
- settings.m_ArbitraryMipmapDetection = Config::Get(Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION);
- settings.m_ArbitraryMipmapDetectionThreshold =
- Config::Get(Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION_THRESHOLD);
- settings.m_EnableGPUTextureDecoding = Config::Get(Config::GFX_ENABLE_GPU_TEXTURE_DECODING);
- settings.m_DeferEFBCopies = Config::Get(Config::GFX_HACK_DEFER_EFB_COPIES);
- settings.m_EFBAccessTileSize = Config::Get(Config::GFX_HACK_EFB_ACCESS_TILE_SIZE);
- settings.m_EFBAccessDeferInvalidation = Config::Get(Config::GFX_HACK_EFB_DEFER_INVALIDATION);
- settings.m_StrictSettingsSync = m_strict_settings_sync_action->isChecked();
- settings.m_SyncSaveData = m_sync_save_data_action->isChecked();
- settings.m_SyncCodes = m_sync_codes_action->isChecked();
- settings.m_SyncAllWiiSaves =
- m_sync_all_wii_saves_action->isChecked() && m_sync_save_data_action->isChecked();
- settings.m_GolfMode = m_golf_mode_action->isChecked();
-
- // Unload GameINI to restore things to normal
- Config::RemoveLayer(Config::LayerType::GlobalGame);
- Config::RemoveLayer(Config::LayerType::LocalGame);
-
- Settings::Instance().GetNetPlayServer()->SetNetSettings(settings);
if (Settings::Instance().GetNetPlayServer()->RequestStartGame())
SetOptionsEnabled(false);
}