mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't panic about delta frames not being ready if we're not even fully

Browse Source 
connected yet.
This commit is contained in:
Gregor Richards 2016-12-17 15:45:29 -05:00
parent 8b21014d07
commit d6d96704fd
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
network/netplay/netplay_io.c
View File

@ -1152,15 +1152,24 @@ int netplay_poll_net_input(netplay_t *netplay, bool block)
netplay->timeout_cnt++;
/* Make sure we're actually ready for data */
netplay_update_unread_ptr(netplay);
if (!netplay_delta_frame_ready(netplay,
&netplay->buffer[netplay->unread_ptr], netplay->unread_frame_count))
break;
if (!netplay->is_server &&
!netplay_delta_frame_ready(netplay,
&netplay->buffer[netplay->server_ptr],
netplay->server_frame_count))
break;
if (netplay->self_mode >= NETPLAY_CONNECTION_CONNECTED)
{
netplay_update_unread_ptr(netplay);
if (!netplay_delta_frame_ready(netplay,
&netplay->buffer[netplay->unread_ptr], netplay->unread_frame_count))
{
fprintf(stderr, "CATASTROPHE: Cannot load %u (%lu) while at %u (%lu)\n", netplay->self_frame_count, netplay->self_ptr, netplay->unread_frame_count, netplay->unread_ptr);
break;
}
if (!netplay->is_server &&
!netplay_delta_frame_ready(netplay,
&netplay->buffer[netplay->server_ptr],
netplay->server_frame_count))
{
fprintf(stderr, "CATASTROPHE DEUX\n");
break;
}
}
/* Read input from each connection */
for (i = 0; i < netplay->connections_size; i++)