From c375111076235313669e71953c877c9512cebd16 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 12 Jun 2015 13:56:53 +0200 Subject: Options: merge SCoreStartupParameter into SConfig --- Source/Core/DolphinWX/NetPlay/NetWindow.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/NetPlay/NetWindow.cpp') diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp index 2658aea656..6a9a8e5a8c 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp @@ -28,7 +28,6 @@ #include "Common/IniFile.h" #include "Core/ConfigManager.h" -#include "Core/CoreParameter.h" #include "Core/NetPlayClient.h" #include "Core/NetPlayProto.h" #include "Core/NetPlayServer.h" @@ -251,9 +250,9 @@ void NetPlayDialog::OnChat(wxCommandEvent&) void NetPlayDialog::GetNetSettings(NetSettings &settings) { SConfig &instance = SConfig::GetInstance(); - settings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread; - settings.m_CPUcore = instance.m_LocalCoreStartupParameter.iCPUCore; - settings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE; + settings.m_CPUthread = instance.bCPUThread; + settings.m_CPUcore = instance.iCPUCore; + settings.m_DSPHLE = instance.bDSPHLE; settings.m_DSPEnableJIT = instance.m_DSPEnableJIT; settings.m_WriteToMemcard = m_memcard_write->GetValue(); settings.m_OCEnable = instance.m_OCEnable; -- cgit v1.2.3