The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-13 07:49:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2442 from lioncash/netplay

Browse Source 
NetPlayClient: Fix erroneous shifts for reconstructing system time.
This commit is contained in:
Lioncash 2015-05-23 23:22:11 -04:00
commit c6088cdf31
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,10 +392,10 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
packet >> tmp;
g_NetPlaySettings.m_EXIDevice[1] = (TEXIDevices)tmp;
u32 x, y;
packet >> x;
packet >> y;
g_netplay_initial_gctime = x | ((u64)y >> 32);
u32 time_low, time_high;
packet >> time_low;
packet >> time_high;
g_netplay_initial_gctime = time_low | ((u64)time_high << 32);
}
m_dialog->OnMsgStartGame();

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

@ -657,7 +657,7 @@ bool NetPlayServer::StartGame()
*spac << m_settings.m_EXIDevice[0];
*spac << m_settings.m_EXIDevice[1];
*spac << (u32)g_netplay_initial_gctime;
*spac << (u32)g_netplay_initial_gctime << 32;
*spac << (u32)(g_netplay_initial_gctime >> 32);
SendAsyncToClients(spac);