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

Merge pull request #2183 from RachelBryk/netplay-time

Browse source 
Use system time for start time in netplay.
This commit is contained in:
skidau 2015-03-18 13:52:17 +11:00
commit 0ac8fd0214
5 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/Core/NetPlayClient.cpp
View file

@ -382,7 +382,10 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
packet >> tmp;
g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices)tmp;
packet >> g_netplay_initial_gctime;
u32 x, y;
packet >> x;
packet >> y;
g_netplay_initial_gctime = x | ((u64)y >> 32);
}
m_dialog->OnMsgStartGame();
@ -1061,7 +1064,7 @@ bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size)
// called from ---CPU--- thread
// so all players' games get the same time
u32 CEXIIPL::NetPlay_GetGCTime()
u64 CEXIIPL::NetPlay_GetGCTime()
{
std::lock_guard<std::mutex> lk(crit_netplay_client);