cleanup unit_creator

wesnoth · Mar 14, 2016 · e89abbe · e89abbe
1 parent 310ba26
commit e89abbe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/actions/unit_creator.cpp b/src/actions/unit_creator.cpp
@@ -157,8 +157,6 @@ void unit_creator::add_unit(const config &cfg, const vconfig* vcfg)
 {
 	config temp_cfg(cfg);
 	temp_cfg["side"] = team_.side();
-	temp_cfg.remove_attribute("player_id");
-	temp_cfg.remove_attribute("faction_from_recruit");
 
 	const std::string& id =(cfg)["id"];
 	bool animate = temp_cfg["animate"].to_bool();

diff --git a/src/team.cpp b/src/team.cpp
@@ -67,7 +67,7 @@ const boost::container::flat_set<std::string> team::attributes = boost::assign::
 	("suppress_end_turn_confirmation")
 	("team_name")("user_team_name")("side_name")("village_gold")("village_support")("is_local")
 	// Multiplayer attributes.
-	("action_bonus_count")("allow_changes")("allow_player")("color_lock")
+	("player_id")("action_bonus_count")("allow_changes")("allow_player")("color_lock")
 	("countdown_time")("disallow_observers")("faction")
 	("faction_from_recruit")("faction_name")("gold_lock")("income_lock")
 	("leader")("random_leader")("team_lock")("terrain_liked")