From 68aa5dc0dbeb5208eabbc820ae1be1f394c88b99 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 9 Jul 2020 02:41:13 +0200
Subject: [PATCH] Move more global state to rarch_state

---
 network/netplay/netplay_discovery.c | 11 +++--------
 retroarch.c                         |  9 +++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index b8e47d1e24..3a868f5dfd 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -71,9 +71,11 @@ struct ad_packet
    char subsystem_name[NETPLAY_HOST_STR_LEN];
 };
 
+/* TODO/FIXME - global referenced outside */
+struct netplay_room *netplay_room_list = NULL;
+
 /* TODO/FIXME - globals - remove to make code thread-safe */
 int netplay_room_count                 = 0;
-struct netplay_room *netplay_room_list = NULL;
 
 /* LAN discovery sockets */
 static int lan_ad_server_fd            = -1;
@@ -86,16 +88,9 @@ static struct ad_packet ad_packet_buffer;
 static struct netplay_host_list discovered_hosts;
 static size_t discovered_hosts_allocated;
 
-static struct netplay_room netplay_host_room = {0};
-
 /* Forward declarations */
 static bool netplay_lan_ad_client(void);
 
-struct netplay_room* netplay_get_host_room(void)
-{
-   return &netplay_host_room;
-}
-
 /** Initialize Netplay discovery (client) */
 bool init_netplay_discovery(void)
 {
diff --git a/retroarch.c b/retroarch.c
index ab35026228..0d6c5f7f61 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2308,6 +2308,9 @@ struct rarch_state
 #ifdef HAVE_DYNAMIC
    dylib_t lib_handle;
 #endif
+#ifdef HAVE_NETWORKING
+   struct netplay_room netplay_host_room;
+#endif
 
 #if defined(HAVE_RUNAHEAD)
    retro_ctx_load_content_info_t *load_content_info;
@@ -2899,6 +2902,12 @@ static void menu_input_post_iterate(
 static void menu_input_reset(struct rarch_state *p_rarch);
 #endif
 
+struct netplay_room* netplay_get_host_room(void)
+{
+   struct rarch_state   *p_rarch  = &rarch_st;
+   return &p_rarch->netplay_host_room;
+}
+
 content_state_t *content_state_get_ptr(void)
 {
    struct rarch_state   *p_rarch  = &rarch_st;