piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -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

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

@ -423,7 +423,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
u32 time_low, time_high;
packet >> time_low;
packet >> time_high;
g_netplay_initial_gctime = time_low | ((u64)time_high << 32);
g_netplay_initial_rtc = time_low | ((u64)time_high << 32);
}
m_dialog->OnMsgStartGame();
@ -1282,12 +1282,12 @@ bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size,
// so all players' games get the same time
//
// also called from ---GUI--- thread when starting input recording
u64 CEXIIPL::NetPlay_GetGCTime()
u64 CEXIIPL::NetPlay_GetEmulatedTime()
{
std::lock_guard<std::mutex> lk(crit_netplay_client);
if (netplay_client)
return g_netplay_initial_gctime;
return g_netplay_initial_rtc;
else
return 0;
}