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

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
parent 4b7748f3c0 e7d237f199
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/NetPlayServer.cpp
View File

@ -20,7 +20,7 @@
#include <arpa/inet.h>
#endif
int g_netplay_initial_gctime = 1272737767;
u64 g_netplay_initial_gctime = 1272737767;
NetPlayServer::~NetPlayServer()
{
@ -648,7 +648,7 @@ bool NetPlayServer::StartGame()
// no change, just update with clients
AdjustPadBufferSize(m_target_buffer_size);
g_netplay_initial_gctime = CEXIIPL::GetGCTime();
g_netplay_initial_gctime = Common::Timer::GetLocalTimeSinceJan1970();
// tell clients to start game
sf::Packet spac;
@ -663,7 +663,8 @@ bool NetPlayServer::StartGame()
spac << m_settings.m_OCFactor;
spac << m_settings.m_EXIDevice[0];
spac << m_settings.m_EXIDevice[1];
spac << g_netplay_initial_gctime;
spac << (u32)g_netplay_initial_gctime;
spac << (u32)g_netplay_initial_gctime << 32;
std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
std::lock_guard<std::recursive_mutex> lks(m_crit.send);