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

Client now starts one frame after finishing connection, for easier sync.

Browse Source
This commit is contained in:
Gregor Richards 2016-12-03 20:20:16 -05:00
parent 80be19a7da
commit 170b590bdb
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
network/netplay/netplay_common.c
View File

@ -376,7 +376,7 @@ bool netplay_handshake_pre_nick(netplay_t *netplay, bool *had_input)
cmd[2] = htonl(netplay->self_frame_count);
if (!netplay_send(&netplay->send_packet_buffer, netplay->fd, cmd,
sizeof(uint32_t)))
sizeof(cmd)))
return false;
if (!netplay_send(&netplay->send_packet_buffer, netplay->fd,
mem_info.data, mem_info.size) ||
@ -384,6 +384,12 @@ bool netplay_handshake_pre_nick(netplay_t *netplay, bool *had_input)
false))
return false;
/* They start one frame after us */
netplay->other_frame_count = netplay->read_frame_count =
netplay->self_frame_count + 1;
netplay->other_ptr = netplay->read_ptr =
NEXT_PTR(netplay->self_ptr);
/* Now we're ready! */
netplay_handshake_ready(netplay);
@ -431,17 +437,17 @@ bool netplay_handshake_pre_sync(netplay_t *netplay, bool *had_input)
netplay->read_frame_count = new_frame_count;
for (i = 0; i < netplay->buffer_size; i++)
{
struct delta_frame *ptr = &netplay->buffer[i];
ptr->used = false;
if (i == netplay->self_ptr)
{
struct delta_frame *ptr = &netplay->buffer[i];
if (!ptr->used)
netplay_delta_frame_ready(netplay, ptr, 0);
/* Clear out any current data but still use this frame */
netplay_delta_frame_ready(netplay, ptr, 0);
ptr->frame = new_frame_count;
ptr->have_local = true;
netplay->other_ptr = netplay->read_ptr = i;
}
else
{
netplay->buffer[i].used = false;
}
}