0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MP: cleanup cleanup cleanup

Browse source
This commit is contained in:
Charles Dang 2020-12-21 14:58:20 +11:00
parent 2bb69baf2b
commit 2674999628
3 changed files with 28 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/game_initialization/multiplayer.cpp
View file

@ -66,23 +66,21 @@ std::unique_ptr<wesnothd_connection> open_connection(std::string host)
}
// shown_hosts is used to prevent the client being locked in a redirect loop.
using hostpair = std::pair<std::string, std::string>;
std::set<std::pair<std::string, std::string>> shown_hosts;
auto addr = shown_hosts.end();
std::set<hostpair> shown_hosts;
hostpair addr;
try {
addr = parse_network_address(host, "15000");
std::tie(addr, std::ignore) = shown_hosts.insert(parse_network_address(host, "15000"));
} catch(const std::runtime_error&) {
throw wesnothd_error(_("Invalid address specified for multiplayer server"));
}
shown_hosts.insert(addr);
// Initializes the connection to the server.
auto conn = std::make_unique<wesnothd_connection>(addr.first, addr.second);
// Start stage
gui2::dialogs::loading_screen::progress(loading_stage::connect_to_server);
// Initializes the connection to the server.
auto conn = std::make_unique<wesnothd_connection>(addr->first, addr->second);
// First, spin until we get a handshake from the server.
conn->wait_for_handshake();
@ -198,9 +196,9 @@ std::unique_ptr<wesnothd_connection> open_connection(std::string host)
do {
std::string password = preferences::password(host, login);
const bool fall_through = (*error)["force_confirmation"].to_bool() ?
(gui2::show_message(_("Confirm"), (*error)["message"], gui2::dialogs::message::ok_cancel_buttons) == gui2::retval::CANCEL) :
false;
const bool fall_through = (*error)["force_confirmation"].to_bool()
? (gui2::show_message(_("Confirm"), (*error)["message"], gui2::dialogs::message::ok_cancel_buttons) == gui2::retval::CANCEL)
: false;
const bool is_pw_request = !((*error)["password_request"].empty()) && !(password.empty());
@ -528,7 +526,7 @@ void mp_manager::enter_staging_mode()
// If we have a connection, set the appropriate info. No connection means we're in local game mode.
if(connection) {
campaign_info.reset(new mp_campaign_info(*connection));
campaign_info = std::make_unique<mp_campaign_info>(*connection);
campaign_info->connected_players.insert(preferences::login());
campaign_info->is_host = true;
}
@ -584,42 +582,20 @@ bool mp_manager::enter_lobby_mode()
int dlg_retval = 0;
int dlg_joined_game_id = 0;
{
gui2::dialogs::mp_lobby dlg(*game_config, lobby_info, *connection);
gui2::dialogs::mp_lobby dlg(*game_config, lobby_info, *connection, dlg_joined_game_id);
dlg.show();
dlg_retval = dlg.get_retval();
dlg_joined_game_id = dlg.get_joined_game_id();
}
switch(dlg_retval) {
try {
switch(dlg_retval) {
case gui2::dialogs::mp_lobby::CREATE:
try {
enter_create_mode();
} catch(const config::error& error) {
if(!error.message.empty()) {
gui2::show_error_message(error.message);
}
// Update lobby content
connection->send_data(config("refresh_lobby"));
}
enter_create_mode();
break;
case gui2::dialogs::mp_lobby::JOIN:
FALLTHROUGH;
case gui2::dialogs::mp_lobby::OBSERVE:
try {
enter_wait_mode(
dlg_joined_game_id,
dlg_retval == gui2::dialogs::mp_lobby::OBSERVE
);
} catch(const config::error& error) {
if(!error.message.empty()) {
gui2::show_error_message(error.message);
}
// Update lobby content
connection->send_data(config("refresh_lobby"));
}
enter_wait_mode(dlg_joined_game_id, dlg_retval == gui2::dialogs::mp_lobby::OBSERVE);
break;
case gui2::dialogs::mp_lobby::RELOAD_CONFIG:
// Let this function's caller reload the config and re-call.
@ -627,6 +603,14 @@ bool mp_manager::enter_lobby_mode()
default:
// Needed to handle the Quit signal and exit the loop
return true;
}
} catch(const config::error& error) {
if(!error.message.empty()) {
gui2::show_error_message(error.message);
}
// Update lobby content
connection->send_data(config("refresh_lobby"));
}
}

4
src/gui/dialogs/multiplayer/lobby.cpp
View file

@ -120,7 +120,7 @@ bool mp_lobby::logout_prompt()
std::string mp_lobby::announcements_ = "";
std::string mp_lobby::server_information_ = "";
mp_lobby::mp_lobby(const game_config_view& game_config, mp::lobby_info& info, wesnothd_connection &connection)
mp_lobby::mp_lobby(const game_config_view& game_config, mp::lobby_info& info, wesnothd_connection &connection, int& joined_game)
: quit_confirmation(&mp_lobby::logout_prompt)
, game_config_(game_config)
, gamelistbox_(nullptr)
@ -142,7 +142,7 @@ mp_lobby::mp_lobby(const game_config_view& game_config, mp::lobby_info& info, we
, gamelist_id_at_row_()
, delay_playerlist_update_(false)
, delay_gamelist_update_(false)
, joined_game_id_(0)
, joined_game_id_(joined_game)
{
// Need to set this in the constructor, pre_show() is too late
set_show_even_without_video(true);

6
src/gui/dialogs/multiplayer/lobby.hpp
View file

@ -64,12 +64,10 @@ struct player_list
class mp_lobby : public modal_dialog, public quit_confirmation, private plugin_executor
{
public:
mp_lobby(const game_config_view& game_config, mp::lobby_info& info, wesnothd_connection &connection);
mp_lobby(const game_config_view& game_config, mp::lobby_info& info, wesnothd_connection &connection, int& joined_game);
~mp_lobby();
int get_joined_game_id() const { return joined_game_id_; }
void update_gamelist();
protected:
@ -215,7 +213,7 @@ private:
bool delay_gamelist_update_;
int joined_game_id_;
int& joined_game_id_;
friend struct lobby_delay_gamelist_update_guard;