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

NetPlay: Sync across whether to save memcards or not

Browse Source 
There's no reason this shouldn't be synced other than laziness.
This commit is contained in:
Jasper St. Pierre
2013-07-22 06:15:08 -04:00
parent 6d463d1b67
commit a963c621dc
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
Source/Core/Core/Src/NetPlay.cpp
View File

@ -264,11 +264,7 @@ bool NetPlay::StopGame()
void NetPlay::SetMemcardWriteEnabled(bool enabled) void NetPlay::SetMemcardWriteEnabled(bool enabled)
{ {
std::lock_guard<std::recursive_mutex> lkg(m_crit.game); std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
g_NetPlaySettings.m_WriteToMemcard = enabled;
if (m_is_running)
{
Core::g_CoreStartupParameter.bEnableMemcardSaving = enabled;
}
} }
// called from ---CPU--- thread // called from ---CPU--- thread

3
Source/Core/Core/Src/NetPlay.h
View File

@ -35,6 +35,7 @@ struct NetSettings
{ {
bool m_DSPHLE; bool m_DSPHLE;
bool m_DSPEnableJIT; bool m_DSPEnableJIT;
bool m_WriteToMemcard;
u8 m_Controllers[4]; u8 m_Controllers[4];
}; };
extern NetSettings g_NetPlaySettings; extern NetSettings g_NetPlaySettings;
@ -46,7 +47,7 @@ struct Rpt : public std::vector<u8>
typedef std::vector<Rpt> NetWiimote; typedef std::vector<Rpt> NetWiimote;
#define NETPLAY_VERSION "Dolphin NetPlay 2013-07-19" #define NETPLAY_VERSION "Dolphin NetPlay 2013-07-22"
// messages // messages
enum enum

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

@ -195,6 +195,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
packet >> m_current_game; packet >> m_current_game;
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;
for (unsigned int i = 0; i < 4; ++i) for (unsigned int i = 0; i < 4; ++i)
packet >> g_NetPlaySettings.m_Controllers[i]; packet >> g_NetPlaySettings.m_Controllers[i];
} }

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

@ -607,6 +607,7 @@ bool NetPlayServer::StartGame(const std::string &path)
spac << NetPlay::m_current_game; spac << NetPlay::m_current_game;
spac << g_NetPlaySettings.m_DSPEnableJIT; spac << g_NetPlaySettings.m_DSPEnableJIT;
spac << g_NetPlaySettings.m_DSPHLE; spac << g_NetPlaySettings.m_DSPHLE;
spac << g_NetPlaySettings.m_WriteToMemcard;
for (unsigned int i = 0; i < 4; ++i) for (unsigned int i = 0; i < 4; ++i)
spac << g_NetPlaySettings.m_Controllers[i]; spac << g_NetPlaySettings.m_Controllers[i];