From 9e8220022a20c81f0d8e2da3d4b9e5f4c834ec1e Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Tue, 6 Mar 2018 22:13:13 +0100 Subject: [PATCH] don't generate [side]s if the [multiplayer] has at least one [side] defined. fixes one part of #2604 --- src/game_initialization/create_engine.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/game_initialization/create_engine.cpp b/src/game_initialization/create_engine.cpp index 59d031966840..bebd59946dc2 100644 --- a/src/game_initialization/create_engine.cpp +++ b/src/game_initialization/create_engine.cpp @@ -106,12 +106,14 @@ void scenario::set_sides() // starting positions, then generate the additional sides const int map_positions = map_->num_valid_starting_positions(); - for(int pos = data_.child_count("side"); pos < map_positions; ++pos) { - config& side = data_.add_child("side"); - side["side"] = pos + 1; - side["team_name"] = "Team " + std::to_string(pos + 1); - side["canrecruit"] = true; - side["controller"] = "human"; + if(!data_.has_child("side")) { + for(int pos = 0; pos < map_positions; ++pos) { + config& side = data_.add_child("side"); + side["side"] = pos + 1; + side["team_name"] = "Team " + std::to_string(pos + 1); + side["canrecruit"] = true; + side["controller"] = "human"; + } } num_players_ = 0;