.

Author: Pentarctagon

src/game_initialization/lobby_info.cpp

@@ -124,16 +124,16 @@ void lobby_info::process_gamelist(const config& data)
 	games_by_id_.clear();
 
 	for(const config& game : prefs::get().get_game_presets()) {
-		const auto game_config = game_config_manager::get()->game_config();
+		const game_config_view& game_config = game_config_manager::get()->game_config();
 
 		optional_const_config scenario = game_config.find_child("multiplayer", "id", game["scenario"].str());
 		if(!scenario) {
-			ERR_LB << "Scenario " << game["scenario"].str() << " not found in game preset " << game["id"];
+			ERR_LB << "Scenario " << game["scenario"].str() << " not found in game config " << game["id"];
 			continue;
 		}
 		optional_const_config era = game_config.find_child("era", "id", game["era"].str());
 		if(!era) {
-			ERR_LB << "Era " << game["era"].str() << " not found in game preset " << game["id"];
+			ERR_LB << "Era " << game["era"].str() << " not found in game config " << game["id"];
 			continue;
 		}
 
@@ -174,7 +174,7 @@ void lobby_info::process_gamelist(const config& data)
 		qgame["observer"] = game["observer"];
 		qgame["human_sides"] = human_sides;
 
-		std::vector<std::string> mods = utils::split(game["mp_modifications"].str());
+		std::vector<std::string> mods = utils::split(game["modifications"].str());
 		for(const std::string& mod : mods) {
 			auto cfg = game_config.find_child("modification", "id", mod);
 
@@ -183,7 +183,7 @@ void lobby_info::process_gamelist(const config& data)
 				m["name"] = cfg["name"];
 				m["id"] = mod;
 			} else {
-				ERR_LB << "Modification " << mod << " not found in game preset " << game["id"];
+				ERR_LB << "Modification " << mod << " not found in game config " << game["id"];
 				continue;
 			}
 		}

src/gui/dialogs/multiplayer/mp_create_game.cpp

@@ -223,7 +223,7 @@ void mp_create_game::quick_mp_setup(saved_game& state, const config presets)
 	params.mode = random_faction_mode::get_enum(presets["random_faction_mode"].str()).value_or(random_faction_mode::type::independent);
 	params.name = settings::game_name_default();
 
-	std::vector<std::string> mods = utils::split(presets["mp_modifications"].str());
+	std::vector<std::string> mods = utils::split(presets["modifications"].str());
 	for(const std::string& mod : mods) {
 		create.active_mods().push_back(mod);
 	}
@@ -649,24 +649,18 @@ void mp_create_game::on_game_select()
 			random_faction_mode::type mode = random_faction_mode::get_enum(preset["random_faction_mode"].str()).value_or(random_faction_mode::type::independent);
 			find_widget<menu_button>("random_faction_mode").set_selected(static_cast<int>(mode));
 
-			const int era_selection = create_engine_.find_extra_by_id(ng::create_engine::ERA, preset["scenario"].str());
+			const int era_selection = create_engine_.find_extra_by_id(ng::create_engine::ERA, preset["era"].str());
 			if(era_selection >= 0) {
 				eras_menu_button_->set_selected(era_selection);
 			}
 			on_era_select();
 
 			int i = 0;
-			const auto& activemods = utils::split(preset["mp_modifications"].str());
+			const auto& activemods = utils::split(preset["modifications"].str());
 			for(const auto& mod : create_engine_.get_extras_by_type(ng::create_engine::MOD)) {
-				if(utils::contains(activemods, mod->id)) {
-					toggle_button& mod_button = mod_list_->get_row_grid(i)->find_widget<toggle_button>("mod_active_state");
-					mod_button.set_value_bool(true);
-					on_mod_toggle(mod->id, &mod_button);
-				} else {
-					toggle_button& mod_button = mod_list_->get_row_grid(i)->find_widget<toggle_button>("mod_active_state");
-					mod_button.set_value_bool(false);
-					on_mod_toggle(mod->id, &mod_button);
-				}
+				toggle_button& mod_button = mod_list_->get_row_grid(i)->find_widget<toggle_button>("mod_active_state");
+				mod_button.set_value_bool(utils::contains(activemods, mod->id));
+				on_mod_toggle(mod->id, &mod_button);
 				i++;
 			}
 
@@ -966,7 +960,7 @@ config mp_create_game::settings_config()
 	settings["turns"] = turns_->get_widget_value();
 	settings["observer"] = observers_->get_widget_value();
 	settings["use_map_settings"] = use_map_settings_->get_widget_value();
-	settings["mp_modifications"] = utils::join(create_engine_.active_mods(), ",");
+	settings["modifications"] = utils::join(create_engine_.active_mods(), ",");
 	settings.add_child("options", options_manager_->get_options_config());
 	random_faction_mode::type type = random_faction_mode::get_enum(selected_rfm_index_).value_or(random_faction_mode::type::independent);
 	settings["random_faction_mode"] = random_faction_mode::get_string(type);