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

Addendum to prior commit - should be good now

Browse Source
This commit is contained in:
LibretroAdmin 2022-10-31 20:32:11 +01:00
parent 9a3a5688b8
commit b2e2330ed7
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/netplay/netplay_frontend.c
View File

@ -4009,8 +4009,8 @@ static void remote_unpaused(netplay_t *netplay,
{ {
struct netplay_connection *sc = &netplay->connections[i]; struct netplay_connection *sc = &netplay->connections[i];
if (sc->flags & if (sc->flags &
(NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED) ((NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)
== (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)) == (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)))
{ {
netplay->remote_paused = true; netplay->remote_paused = true;
break; break;
@ -7136,8 +7136,8 @@ static void netplay_frontend_paused(netplay_t *netplay, bool paused)
{ {
struct netplay_connection *connection = &netplay->connections[i]; struct netplay_connection *connection = &netplay->connections[i];
if (connection->flags & if (connection->flags &
(NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED) ((NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)
== (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)) == (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)))
paused_ct++; paused_ct++;
} }

24
retroarch.c
View File

@ -3474,16 +3474,16 @@ void retroarch_override_setting_set(
break; break;
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
case RARCH_OVERRIDE_SETTING_NETPLAY_MODE: case RARCH_OVERRIDE_SETTING_NETPLAY_MODE:
net_st->has_set_netplay_mode = true; net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE;
break; break;
case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS: case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS:
net_st->has_set_netplay_ip_address = true; net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS;
break; break;
case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT: case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT:
net_st->has_set_netplay_ip_port = true; net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT;
break; break;
case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES: case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES:
net_st->has_set_netplay_check_frames = true; net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES;
break; break;
#endif #endif
case RARCH_OVERRIDE_SETTING_UPS_PREF: case RARCH_OVERRIDE_SETTING_UPS_PREF:
@ -3548,16 +3548,16 @@ void retroarch_override_setting_unset(
break; break;
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
case RARCH_OVERRIDE_SETTING_NETPLAY_MODE: case RARCH_OVERRIDE_SETTING_NETPLAY_MODE:
net_st->has_set_netplay_mode = false; net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE;
break; break;
case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS: case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS:
net_st->has_set_netplay_ip_address = false; net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS;
break; break;
case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT: case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT:
net_st->has_set_netplay_ip_port = false; net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT;
break; break;
case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES: case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES:
net_st->has_set_netplay_check_frames = false; net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES;
break; break;
#endif #endif
case RARCH_OVERRIDE_SETTING_UPS_PREF: case RARCH_OVERRIDE_SETTING_UPS_PREF:
@ -5889,13 +5889,13 @@ bool retroarch_override_setting_is_set(
return ((p_rarch->flags & RARCH_FLAGS_HAS_SET_STATE_PATH) > 0); return ((p_rarch->flags & RARCH_FLAGS_HAS_SET_STATE_PATH) > 0);
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
case RARCH_OVERRIDE_SETTING_NETPLAY_MODE: case RARCH_OVERRIDE_SETTING_NETPLAY_MODE:
return net_st->has_set_netplay_mode; return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE) > 0);
case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS: case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS:
return net_st->has_set_netplay_ip_address; return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS) > 0);
case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT: case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT:
return net_st->has_set_netplay_ip_port; return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT) > 0);
case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES: case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES:
return net_st->has_set_netplay_check_frames; return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES) > 0);
#endif #endif
#ifdef HAVE_PATCH #ifdef HAVE_PATCH
case RARCH_OVERRIDE_SETTING_UPS_PREF: case RARCH_OVERRIDE_SETTING_UPS_PREF: