fix commandline mp start

src/multiplayer.cpp

@@ -762,8 +762,8 @@ void start_local_game_commandline(game_display& disp, const config& game_config,
 	DBG_MP << "entering create mode" << std::endl;
 
 	// Set the default parameters
-	mp_game_settings parameters;  // This creates these parameters with default values defined in mp_game_settings.cpp
-
+	state = saved_game(); // This creates these parameters with default values defined in mp_game_settings.cpp
+	mp_game_settings& parameters = state.mp_settings();  
 	// Hardcoded default values
 	parameters.mp_era = "era_default";
 	parameters.name = "multiplayer_The_Freelands";
@@ -818,23 +818,23 @@ void start_local_game_commandline(game_display& disp, const config& game_config,
 	// Should the map be randomly generated?
 	if (level["map_generation"].empty()) {
 		DBG_MP << "using scenario map" << std::endl;
-		parameters.scenario_data = level;
+		state.set_scenario(level);
 	} else {
 		DBG_MP << "generating random map" << std::endl;
 		util::scoped_ptr<map_generator> generator(NULL);
 		generator.assign(create_map_generator(level["map_generation"], level.child("generator")));
-		parameters.scenario_data = generator->create_scenario(std::vector<std::string>());
+		state.set_scenario(generator->create_scenario(std::vector<std::string>()));
 
 		// Set the scenario to have placing of sides
 		// based on the terrain they prefer
-		parameters.scenario_data["modify_placing"] = "true";
+		state.get_starting_pos()["modify_placing"] = "true";
 
 		util::unique_ptr<gamemap> map;
 		const int map_positions = level.child("generator")["players"];
 		DBG_MP << "map positions: " << map_positions << std::endl;
 
-		for (int pos = parameters.scenario_data.child_count("side"); pos < map_positions; ++pos) {
-			config& side = parameters.scenario_data.add_child("side");
+		for (int pos = state.get_starting_pos().child_count("side"); pos < map_positions; ++pos) {
+			config& side = state.get_starting_pos().add_child("side");
 			side["side"] = pos + 1;
 			side["team_name"] = pos + 1;
 			side["canrecruit"] = true;
@@ -843,9 +843,9 @@ void start_local_game_commandline(game_display& disp, const config& game_config,
 	}
 
 	// Should number of turns be determined from scenario data?
-	if (parameters.use_map_settings && parameters.scenario_data["turns"]) {
-		DBG_MP << "setting turns from scenario data: " << parameters.scenario_data["turns"] << std::endl;
-		parameters.num_turns = parameters.scenario_data["turns"];
+	if (parameters.use_map_settings && state.get_starting_pos()["turns"]) {
+		DBG_MP << "setting turns from scenario data: " << state.get_starting_pos()["turns"] << std::endl;
+		parameters.num_turns = state.get_starting_pos()["turns"];
 	}
 
 	DBG_MP << "entering connect mode" << std::endl;