mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-24 11:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare timebase of netplay users to detect desyncs.

Browse source
This commit is contained in:
Rachel Bryk 2015-03-08 06:50:47 -04:00 • committed by comex
parent 3d9fdf57e8
commit 04ca54623c
6 changed files with 94 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -374,6 +374,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
case NP_MSG_START_GAME:
{
{
SConfig::GetInstance().m_NetplayDesyncCheck = true;
std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
packet >> m_current_game;
packet >> g_NetPlaySettings.m_CPUthread;
@ -442,6 +443,24 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
}
break;
case NP_MSG_DESYNC_DETECTED:
{
if (!SConfig::GetInstance().m_NetplayDesyncCheck)
break;
int id;
u32 frame;
packet >> id;
packet >> frame;
std::string sID = "";
if (id != -1)
sID = StringFromFormat(" from player ID %d", id);
m_dialog->AppendChat("Possible desync detected" + sID + StringFromFormat(" on frame: %u", frame));
SConfig::GetInstance().m_NetplayDesyncCheck = false;
}
break;
default:
PanicAlertT("Unknown message received with id : %d", mid);
break;
@ -1044,6 +1063,20 @@ u8 NetPlayClient::LocalWiimoteToInGameWiimote(u8 local_pad)
return ingame_pad;
}
void NetPlayClient::SendTimeBase()
{
std::lock_guard<std::mutex> lk(crit_netplay_client);
u64 timebase = SystemTimers::GetFakeTimeBase();
sf::Packet* spac = new sf::Packet;
*spac << (MessageId)NP_MSG_TIMEBASE;
*spac << (u32)timebase;
*spac << (u32)(timebase << 32);
*spac << (u32)Movie::g_currentFrame;
netplay_client->SendAsync(spac);
}
// stuff hacked into dolphin
// called from ---CPU--- thread