From 5f40636fa9041f7da1b7da6157788f743e1d8d74 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Tue, 18 Jul 2017 19:51:09 +0200 Subject: [PATCH] [scenario] allow_new_game= now defaults to false also [campaign] first_scenario= is no longer ignores for mp campaigns. --- src/gui/dialogs/multiplayer/mp_create_game.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/dialogs/multiplayer/mp_create_game.cpp b/src/gui/dialogs/multiplayer/mp_create_game.cpp index 893c8d299ae2..bd9fe302f9cb 100644 --- a/src/gui/dialogs/multiplayer/mp_create_game.cpp +++ b/src/gui/dialogs/multiplayer/mp_create_game.cpp @@ -790,14 +790,16 @@ void mp_create_game::post_show(window& window) const auto& tagname = create_engine_.get_state().classification().get_tagname(); if(tagname == "scenario") { + const std::string first_scenario = create_engine_.current_level().data()["first_scenario"]; for(const config& scenario : game_config_manager::get()->game_config().child_range(tagname)) { - if(scenario["allow_new_game"].to_bool(true) || game_config::debug) { + const bool is_first = scenario["id"] == first_scenario; + if(scenario["allow_new_game"].to_bool(false) || is_first || game_config::debug ) { const std::string& title = !scenario["new_game_title"].empty() ? scenario["new_game_title"] : scenario["name"]; - entry_points.push_back(&scenario); - entry_point_titles.push_back(title); + entry_points.insert(is_first ? entry_points.begin() : entry_points.end(), &scenario); + entry_point_titles.push_back(is_first ? entry_point_titles.begin() : entry_point_titles.end(), title); } } }