libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-09 23:54:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Moved the advance of self_ptr to the same place as the advance of

Browse Source 
self_frame_count, which is much clearer.
This commit is contained in:
Gregor Richards 2016-09-13 20:37:53 -04:00
parent 99b5ed92ed
commit d4e074dbed
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/netplay/netplay.c
View File

@ -105,7 +105,6 @@ static bool get_self_input_state(netplay_t *netplay)
if (ptr->have_local)
{
/* We've already read this frame! */
netplay->self_ptr = NEXT_PTR(netplay->self_ptr);
return true;
}
@ -167,7 +166,6 @@ static bool get_self_input_state(netplay_t *netplay)
memcpy(ptr->self_state, state, sizeof(state));
ptr->have_local = true;
netplay->self_ptr = NEXT_PTR(netplay->self_ptr);
return true;
}
@ -372,7 +370,7 @@ static int poll_input(netplay_t *netplay, bool block)
/* TODO: Somewhat better prediction. :P */
static void simulate_input(netplay_t *netplay)
{
size_t ptr = PREV_PTR(netplay->self_ptr);
size_t ptr = netplay->self_ptr;
size_t prev = PREV_PTR(netplay->read_ptr);
memcpy(netplay->buffer[ptr].simulated_input_state,
@ -414,7 +412,7 @@ static bool netplay_poll(netplay_t *netplay)
}
/* Simulate the input if we don't have real input */
if (!netplay->buffer[PREV_PTR(netplay->self_ptr)].have_remote)
if (!netplay->buffer[netplay->self_ptr].have_remote)
simulate_input(netplay);
/* Consider stalling */
@ -511,7 +509,7 @@ static int16_t netplay_input_state(netplay_t *netplay,
unsigned idx, unsigned id)
{
size_t ptr = netplay->is_replay ?
netplay->replay_ptr : PREV_PTR(netplay->self_ptr);
netplay->replay_ptr : netplay->self_ptr;
const uint32_t *curr_input_state = netplay->buffer[ptr].self_state;

1
network/netplay/netplay_net.c
View File

@ -62,6 +62,7 @@ static void netplay_net_pre_frame(netplay_t *netplay)
**/
static void netplay_net_post_frame(netplay_t *netplay)
{
netplay->self_ptr = NEXT_PTR(netplay->self_ptr);
netplay->self_frame_count++;
/* Only relevant if we're connected */