ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2653 from AdmiralCurtiss/netplay-video-mode-sync 

Netplay: Sync Video Mode settings. (Progressive Scan and PAL60)
This commit is contained in:
Scott Mansell 2015-08-02 12:42:21 +12:00
parent a3eb16c6e1 84e42904a2
commit 8dd9d35689
5 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/BootManager.cpp
View File

@ -246,6 +246,8 @@ bool BootCore(const std::string& _rFilename)
StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore;
StartUp.SelectedLanguage = g_NetPlaySettings.m_SelectedLanguage;
StartUp.bOverrideGCLanguage = g_NetPlaySettings.m_OverrideGCLanguage;
StartUp.bProgressive = g_NetPlaySettings.m_ProgressiveScan;
StartUp.bPAL60 = g_NetPlaySettings.m_PAL60;
SConfig::GetInstance().m_DSPEnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
SConfig::GetInstance().m_OCEnable = g_NetPlaySettings.m_OCEnable;
SConfig::GetInstance().m_OCFactor = g_NetPlaySettings.m_OCFactor;

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

@ -381,6 +381,8 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
packet >> g_NetPlaySettings.m_CPUcore;
packet >> g_NetPlaySettings.m_SelectedLanguage;
packet >> g_NetPlaySettings.m_OverrideGCLanguage;
packet >> g_NetPlaySettings.m_ProgressiveScan;
packet >> g_NetPlaySettings.m_PAL60;
packet >> g_NetPlaySettings.m_DSPEnableJIT;
packet >> g_NetPlaySettings.m_DSPHLE;
packet >> g_NetPlaySettings.m_WriteToMemcard;

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

@ -14,6 +14,8 @@ struct NetSettings
int m_CPUcore;
int m_SelectedLanguage;
bool m_OverrideGCLanguage;
bool m_ProgressiveScan;
bool m_PAL60;
bool m_DSPHLE;
bool m_DSPEnableJIT;
bool m_WriteToMemcard;
@ -31,7 +33,7 @@ struct Rpt : public std::vector<u8>
typedef std::vector<u8> NetWiimote;
#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-14"
#define NETPLAY_VERSION "Dolphin NetPlay 2015-06-24"
extern u64 g_netplay_initial_gctime;

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

@ -717,6 +717,8 @@ bool NetPlayServer::StartGame()
*spac << m_settings.m_CPUcore;
*spac << m_settings.m_SelectedLanguage;
*spac << m_settings.m_OverrideGCLanguage;
*spac << m_settings.m_ProgressiveScan;
*spac << m_settings.m_PAL60;
*spac << m_settings.m_DSPEnableJIT;
*spac << m_settings.m_DSPHLE;
*spac << m_settings.m_WriteToMemcard;

2
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -254,6 +254,8 @@ void NetPlayDialog::GetNetSettings(NetSettings &settings)
settings.m_CPUcore = instance.iCPUCore;
settings.m_SelectedLanguage = instance.SelectedLanguage;
settings.m_OverrideGCLanguage = instance.bOverrideGCLanguage;
settings.m_ProgressiveScan = instance.bProgressive;
settings.m_PAL60 = instance.bPAL60;
settings.m_DSPHLE = instance.bDSPHLE;
settings.m_DSPEnableJIT = instance.m_DSPEnableJIT;
settings.m_WriteToMemcard = m_memcard_write->GetValue();