Fix a few bits broken by merging.

This commit is contained in:
Gregor Richards 2016-11-30 23:07:39 -05:00
parent 900e5a79ec
commit 36a93e5697

View File

@ -411,8 +411,9 @@ static bool get_self_input_state(netplay_t *netplay)
if (!netplay->spectate.enabled) /* Spectate sends in its own way */ if (!netplay->spectate.enabled) /* Spectate sends in its own way */
{ {
if (!netplay_send(&netplay->send_packet_buffer, netplay->fd, cmdbuf, if (!netplay_send(&netplay->send_packet_buffer, netplay->fd,
sizeof(cmdbuf))) netplay->input_packet_buffer,
sizeof(netplay->input_packet_buffer)))
{ {
hangup(netplay); hangup(netplay);
return false; return false;
@ -466,7 +467,7 @@ bool netplay_cmd_request_savestate(netplay_t *netplay)
static ssize_t netplay_recva(netplay_t *netplay, void *buf, size_t len) static ssize_t netplay_recva(netplay_t *netplay, void *buf, size_t len)
{ {
return netplay_recv(&netplay->read_packet_buffer, netplay->fd, buf, len, false); return netplay_recv(&netplay->recv_packet_buffer, netplay->fd, buf, len, false);
} }
static bool netplay_get_cmd(netplay_t *netplay) static bool netplay_get_cmd(netplay_t *netplay)
@ -783,6 +784,8 @@ shrt:
/* No more data, reset and try again */ /* No more data, reset and try again */
netplay_recv_reset(&netplay->recv_packet_buffer); netplay_recv_reset(&netplay->recv_packet_buffer);
return true; return true;
#undef RECV
} }
static int poll_input(netplay_t *netplay, bool block) static int poll_input(netplay_t *netplay, bool block)