mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3683 from GregorR/netplay-df-0-workaround

Browse Source 
Fix delay_frames=0 mode to work with the recent late-loading workaround
This commit is contained in:
Alcaro 2016-09-28 21:48:43 +02:00 committed by GitHub
commit 0f4fe8b4d4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/netplay/netplay.c
View File

@ -598,7 +598,7 @@ static bool netplay_poll(netplay_t *netplay)
/* WORKAROUND: The only reason poll_input is ignored in the first frame is /* WORKAROUND: The only reason poll_input is ignored in the first frame is
* that some cores can't report state size until after the first frame. */ * that some cores can't report state size until after the first frame. */
if (netplay->self_frame_count > 0) if (netplay->self_frame_count > 0 || netplay->stall)
{ {
/* Read Netplay input, block if we're configured to stall for input every /* Read Netplay input, block if we're configured to stall for input every
* frame */ * frame */

5
network/netplay/netplay_net.c
View File

@ -261,7 +261,10 @@ static void netplay_net_post_frame(netplay_t *netplay)
serial_info.data_const = netplay->buffer[netplay->replay_ptr].state; serial_info.data_const = netplay->buffer[netplay->replay_ptr].state;
serial_info.size = netplay->state_size; serial_info.size = netplay->state_size;
core_unserialize(&serial_info); if (!core_unserialize(&serial_info))
{
RARCH_ERR("Netplay savestate loading failed: Prepare for desync!\n");
}
while (netplay->replay_frame_count < netplay->self_frame_count) while (netplay->replay_frame_count < netplay->self_frame_count)
{ {