mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually USE the new slave options in config.

Browse Source
This commit is contained in:
Gregor Richards 2017-02-23 21:49:22 -05:00
parent a3e3b3e790
commit 07cfd90dc6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/netplay/netplay_io.c
View File

@ -24,6 +24,7 @@
#include "netplay_private.h" #include "netplay_private.h"
#include "../../configuration.h"
#include "../../runloop.h" #include "../../runloop.h"
#include "../../tasks/tasks_internal.h" #include "../../tasks/tasks_internal.h"
@ -664,6 +665,7 @@ static bool netplay_get_cmd(netplay_t *netplay,
uint32_t payload[2]; uint32_t payload[2];
uint32_t player = 0; uint32_t player = 0;
bool slave = false; bool slave = false;
settings_t *settings = config_get_ptr();
/* Check if they requested slave mode */ /* Check if they requested slave mode */
if (cmd_size == sizeof(uint32_t)) if (cmd_size == sizeof(uint32_t))
@ -684,6 +686,12 @@ static bool netplay_get_cmd(netplay_t *netplay,
return netplay_cmd_nak(netplay, connection); return netplay_cmd_nak(netplay, connection);
} }
/* Check if their slave mode request corresponds with what we allow */
if (settings->netplay.require_slaves)
slave = true;
else if (!settings->netplay.allow_slaves)
slave = false;
payload[0] = htonl(netplay->self_frame_count + 1); payload[0] = htonl(netplay->self_frame_count + 1);
if (!netplay->is_server) if (!netplay->is_server)