From 4d580b4f36749b4136d69e91302c41cd4150e5d2 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Tue, 10 Oct 2017 12:00:29 +1100 Subject: [PATCH] Team: reformatted list of allowed [side] keys [ci skip] --- src/team.cpp | 72 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/src/team.cpp b/src/team.cpp index 79cf5272a9f19..d1535ec263bbd 100644 --- a/src/team.cpp +++ b/src/team.cpp @@ -51,21 +51,67 @@ const int team::default_team_gold_ = 100; // Update this list of attributes if you change what is used to define a side // (excluding those attributes used to define the side's leader). -const std::set team::attributes {"ai_config", - "carryover_add", "carryover_percentage", "color", "controller", "current_player", "defeat_condition", "flag", - "flag_icon", "fog", "fog_data", "gold", "hidden", "income", - "no_leader", "objectives", "objectives_changed", "persistent", "lost", - "recall_cost", "recruit", "save_id", "scroll_to_leader", - "share_vision", "share_maps" ,"share_view", "shroud", "shroud_data", "start_gold", +const std::set team::attributes { + "ai_config", + "carryover_add", + "carryover_percentage", + "color", + "controller", + "current_player", + "defeat_condition", + "flag", + "flag_icon", + "fog", + "fog_data", + "gold", + "hidden", + "income", + "no_leader", + "objectives", + "objectives_changed", + "persistent", + "lost", + "recall_cost", + "recruit", + "save_id", + "scroll_to_leader", + "share_vision", + "share_maps", + "share_view", + "shroud", + "shroud_data", + "start_gold", "suppress_end_turn_confirmation", - "team_name", "user_team_name", "side_name", "village_gold", "village_support", "is_local", + "team_name", + "user_team_name", + "side_name", + "village_gold", + "village_support", + "is_local", // Multiplayer attributes. - "player_id", "is_host","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", - "user_description", "controller_lock", "chose_random", - "disallow_shuffle", "description"}; + "player_id", + "is_host", + "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", + "user_description", + "controller_lock", + "chose_random", + "disallow_shuffle", + "description" +}; team::team_info::team_info() : gold(0),