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

Fix the MP Create Dialog's handling of unplayable maps

Browse source 
The UX seems to already be prepared for this - if the map doesn't load then
the create_engine class puts an error message in the map description, which
is shown on the top-left of the MP Create Dialog when the map is selected.

Fixes bugs #3149, #4395 and #4545.  The block deleted in this commit skipped
adding an entry to the games_list listbox, which broke assumptions elsewhere
that the indices returned by create_game_.get_filtered_level_indices()
correspond to the indices in the listbox.
This commit is contained in:
Steve Cotton 2020-03-16 00:01:06 +01:00
parent 4682b45de1
commit d4c34c5586
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/dialogs/multiplayer/mp_create_game.cpp
View file

@ -607,10 +607,6 @@ void mp_create_game::display_games_of_type(window& window, ng::level::TYPE type,
list.clear();
for(const auto& game : create_engine_.get_levels_by_type_unfiltered(type)) {
if(!game->can_launch_game()) {
continue;
}
std::map<std::string, string_map> data;
string_map item;
@ -840,6 +836,16 @@ bool mp_create_game::dialog_exit_hook(window& /*window*/)
return false;
}
if(!create_engine_.current_level().can_launch_game()) {
std::stringstream msg;
// TRANSLATORS: This sentence will be followed by some details of the error, most likely the "Map could not be loaded" message from create_engine.cpp
msg << _("The selected game can not be created.");
msg << "\n\n";
msg << create_engine_.current_level().description();
gui2::show_transient_error_message(msg.str());
return false;
}
if(!create_engine_.is_campaign()) {
return true;
}