mp connect should ignore extra_recruit

extra_recruit is a unit specific attribute like canrecruit, upkeep or
placement. It should not be related to factions recruitlist.
This commit is contained in:
gfgtdf 2015-06-18 19:49:05 +02:00
parent f149990041
commit e8723b9ebb
2 changed files with 1 additions and 2 deletions

View File

@ -59,7 +59,6 @@ const std::string attributes_to_trim[] = {
"type",
"gender",
"recruit",
"extra_recruit",
"player_id",
"previous_recruits",
"controller",

View File

@ -50,7 +50,7 @@ flg_manager::flg_manager(const std::vector<const config*>& era_factions,
side_["default_recruit"].empty() :
side_["recruit"].empty()) ||
side_["no_recruit"].to_bool()) &&
side_["previous_recruits"].empty() && side_["extra_recruit"].empty()),
side_["previous_recruits"].empty()),
faction_lock_(side_["faction_lock"].to_bool(lock_settings) && use_map_settings),
leader_lock_(side_["leader_lock"].to_bool(lock_settings) && use_map_settings),
color_(color),