From feccf66231a399166211664019dcfb74f4389acb Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 3 Nov 2017 13:07:01 +1100 Subject: [PATCH] MP Lobby: disable Current Room user list for now Room support was lost when porting wesnothd to boost::asio and has yet to be re-added. Hiding this for now. --- src/gui/dialogs/multiplayer/lobby.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/gui/dialogs/multiplayer/lobby.cpp b/src/gui/dialogs/multiplayer/lobby.cpp index 433537f7829b..f1ddf3536274 100644 --- a/src/gui/dialogs/multiplayer/lobby.cpp +++ b/src/gui/dialogs/multiplayer/lobby.cpp @@ -104,7 +104,9 @@ void player_list::init(window& w) { active_game.init(w, _("Selected Game")); other_games.init(w, _("Other Games")); +#ifdef ENABLE_ROOM_MEMBER_TREE active_room.init(w, _("Current Room")); +#endif other_rooms.init(w, _("Lobby"), true); sort_by_name = find_widget(&w, "player_list_sort_name", false, true); @@ -586,12 +588,16 @@ void mp_lobby::update_playerlist() } assert(player_list_.active_game.tree); +#ifdef ENABLE_ROOM_MEMBER_TREE assert(player_list_.active_room.tree); +#endif assert(player_list_.other_games.tree); assert(player_list_.other_rooms.tree); player_list_.active_game.tree->clear(); +#ifdef ENABLE_ROOM_MEMBER_TREE player_list_.active_room.tree->clear(); +#endif player_list_.other_games.tree->clear(); player_list_.other_rooms.tree->clear(); @@ -604,6 +610,7 @@ void mp_lobby::update_playerlist() std::stringstream icon_ss; icon_ss << "lobby/status"; switch(user.state) { +#ifdef ENABLE_ROOM_MEMBER_TREE case mp::user_info::SEL_ROOM: icon_ss << "-lobby"; target_list = &player_list_.active_room; @@ -611,6 +618,7 @@ void mp_lobby::update_playerlist() target_list = &player_list_.other_rooms; } break; +#endif case mp::user_info::LOBBY: icon_ss << "-lobby"; target_list = &player_list_.other_rooms; @@ -679,7 +687,9 @@ void mp_lobby::update_playerlist() } player_list_.active_game.update_player_count_label(); +#ifdef ENABLE_ROOM_MEMBER_TREE player_list_.active_room.update_player_count_label(); +#endif player_list_.other_rooms.update_player_count_label(); player_list_.other_games.update_player_count_label();