mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-19 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Options: merge SCoreStartupParameter into SConfig

Browse source
This commit is contained in:
degasus 2015-06-12 13:56:53 +02:00
commit c375111076
114 changed files with 1100 additions and 1163 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View file

@ -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;