From 5aaa095c14bfff475178cd67e449f93ba3f53355 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 9 Jul 2022 13:39:29 +0000 Subject: [PATCH] Move Active_udp_games into netgame_list_game_menu --- similar/main/net_udp.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index 74eb3e77c..d559a0a81 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -357,7 +357,6 @@ static unsigned UDP_mdata_queue_highest; static std::array UDP_mdata_queue; static std::array UDP_mdata_trace; static UDP_sequence_syncplayer_packet UDP_sync_player; // For rejoin object syncing -static std::array Active_udp_games; static uint16_t UDP_MyPort; #if DXX_USE_IPv6 #define dispatch_sockaddr_from from.sin6 @@ -1156,6 +1155,7 @@ struct netgame_list_game_menu : netgame_list_game_menu_items, direct_join, newme { unsigned num_active_udp_games = 0; uint8_t num_active_udp_changed = 1; + std::array Active_udp_games = {}; netgame_list_game_menu(grs_canvas &src) : newmenu(menu_title{"NETGAMES"}, menu_subtitle{nullptr}, menu_filename{nullptr}, tiny_mode_flag::tiny, tab_processing_flag::process, adjusted_citem::create(menus, 0), src) { @@ -1603,8 +1603,6 @@ void net_udp_list_join_game(grs_canvas &canvas) net_udp_flush(UDP_Socket); net_udp_listen(); // Throw out old info - Active_udp_games = {}; - gr_set_fontcolor(canvas, BM_XRGB(15, 15, 23),-1); auto menu = window_create(canvas); @@ -3038,9 +3036,9 @@ static void net_udp_process_game_info(const uint8_t *data, uint_fast32_t, const menu->num_active_udp_changed = 1; - auto r = partial_range(Active_udp_games, menu->num_active_udp_games); + auto r = partial_range(menu->Active_udp_games, menu->num_active_udp_games); auto i = std::find_if(r.begin(), r.end(), [&recv_game](const UDP_netgame_info_lite &g) { return !d_stricmp(g.game_name.data(), recv_game.game_name.data()) && g.GameID == recv_game.GameID; }); - if (i == Active_udp_games.end()) + if (i == menu->Active_udp_games.end()) { return; }