Skip to content

Commit

Permalink
Merge pull request #4809 from stevecotton/mp_create_unknown_tile_master
Browse files Browse the repository at this point in the history
Fix the MP Create Dialog's handling of unplayable maps
  • Loading branch information
Vultraz committed Mar 16, 2020
2 parents 4682b45 + d4c34c5 commit c173d01
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/gui/dialogs/multiplayer/mp_create_game.cpp
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit c173d01

Please sign in to comment.