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

Simplify and improve.

Browse source 
Note - I removed a SleepCurrentThread(1) the patch added which seemed to
be unrelated to the actual job at hand.  If there was a real need for it
(which sounds like it would be an enet-related bug - enet_host_service
is supposed to *sleep*), that needs to be dealt with...
This commit is contained in:
comex 2015-06-05 19:00:26 -04:00
commit f2631a835e
5 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -374,7 +374,6 @@ 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;
@ -445,19 +444,21 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
case NP_MSG_DESYNC_DETECTED:
{
if (!SConfig::GetInstance().m_NetplayDesyncCheck)
break;
int id;
int pid_to_blame;
u32 frame;
packet >> id;
packet >> pid_to_blame;
packet >> frame;
std::string sID = "";
if (id != -1)
sID = StringFromFormat(" from player ID %d", id);
const char* blame_str = "";
const char* blame_name = "";
std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
if (pid_to_blame != -1)
{
auto it = m_players.find(pid_to_blame);
blame_str = " from player ";
blame_name = it != m_players.end() ? it->second.name.c_str() : "??";
}
m_dialog->AppendChat("Possible desync detected" + sID + StringFromFormat(" on frame: %u", frame));
SConfig::GetInstance().m_NetplayDesyncCheck = false;
m_dialog->AppendChat(StringFromFormat("/!\\ Possible desync detected%s%s on frame %u", blame_str, blame_name, frame));
}
break;