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

EXI_DeviceIPL: Unify GetGCTime epoch handling

Browse Source
This commit is contained in:
JosJuice
2016-10-29 14:01:00 +02:00
parent 8155a253c6
commit 9950209bbf
10 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
#include <arpa/inet.h>
#endif
u64 g_netplay_initial_gctime = 1272737767;
u64 g_netplay_initial_rtc = 1272737767;
NetPlayServer::~NetPlayServer()
{
@ -789,9 +789,9 @@ bool NetPlayServer::StartGame()
AdjustPadBufferSize(m_target_buffer_size);
if (SConfig::GetInstance().bEnableCustomRTC)
g_netplay_initial_gctime = SConfig::GetInstance().m_customRTCValue;
g_netplay_initial_rtc = SConfig::GetInstance().m_customRTCValue;
else
g_netplay_initial_gctime = Common::Timer::GetLocalTimeSinceJan1970();
g_netplay_initial_rtc = Common::Timer::GetLocalTimeSinceJan1970();
// tell clients to start game
auto spac = std::make_unique<sf::Packet>();
@ -811,8 +811,8 @@ bool NetPlayServer::StartGame()
*spac << m_settings.m_OCFactor;
*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_rtc;
*spac << (u32)(g_netplay_initial_rtc >> 32);
SendAsyncToClients(std::move(spac));