piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Increases Gamecube pad polling rate during netplay to normal. Also re-add dualcore setting syncing to netplay, which I had erroneously removed.

Browse Source
This commit is contained in:
Justin Chadwick
2013-08-18 01:43:49 -04:00
committed by Rachel Bryk
parent 803b7ae991
commit 26242de914
5 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/BootManager.cpp
View File

@ -140,6 +140,7 @@ bool BootCore(const std::string& _rFilename)
if (NetPlay::IsNetPlayRunning()) if (NetPlay::IsNetPlayRunning())
{ {
StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE; StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard; StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard;
SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT; SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT;

4
Source/Core/Core/Src/HW/SI.cpp
View File

@ -644,10 +644,12 @@ void RunSIBuffer()
int GetTicksToNextSIPoll() int GetTicksToNextSIPoll()
{ {
// Poll for input at regular intervals (once per frame) when playing or recording a movie // Poll for input at regular intervals (once per frame) when playing or recording a movie
if (Movie::IsPlayingInput() || Movie::IsRecordingInput() || NetPlay::IsNetPlayRunning()) if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
{ {
return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate; return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
} }
if (NetPlay::IsNetPlayRunning())
return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate / 2;
if (!g_Poll.Y && g_Poll.X) if (!g_Poll.Y && g_Poll.X)
return VideoInterface::GetTicksPerLine() * g_Poll.X; return VideoInterface::GetTicksPerLine() * g_Poll.X;

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

@ -253,6 +253,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
{ {
std::lock_guard<std::recursive_mutex> lkg(m_crit.game); std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
packet >> m_current_game; packet >> m_current_game;
packet >> g_NetPlaySettings.m_CPUthread;
packet >> g_NetPlaySettings.m_DSPEnableJIT; packet >> g_NetPlaySettings.m_DSPEnableJIT;
packet >> g_NetPlaySettings.m_DSPHLE; packet >> g_NetPlaySettings.m_DSPHLE;
packet >> g_NetPlaySettings.m_WriteToMemcard; packet >> g_NetPlaySettings.m_WriteToMemcard;

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

@ -10,6 +10,7 @@
struct NetSettings struct NetSettings
{ {
bool m_CPUthread;
bool m_DSPHLE; bool m_DSPHLE;
bool m_DSPEnableJIT; bool m_DSPEnableJIT;
bool m_WriteToMemcard; bool m_WriteToMemcard;

1
Source/Core/Core/Src/NetPlayServer.cpp
View File

@ -554,6 +554,7 @@ bool NetPlayServer::StartGame(const std::string &path)
sf::Packet spac; sf::Packet spac;
spac << (MessageId)NP_MSG_START_GAME; spac << (MessageId)NP_MSG_START_GAME;
spac << m_current_game; spac << m_current_game;
spac << m_settings.m_CPUthread;
spac << m_settings.m_DSPEnableJIT; spac << m_settings.m_DSPEnableJIT;
spac << m_settings.m_DSPHLE; spac << m_settings.m_DSPHLE;
spac << m_settings.m_WriteToMemcard; spac << m_settings.m_WriteToMemcard;