diff --git a/src/gamestatus.cpp b/src/gamestatus.cpp index d5df334abd29..ee342bfe2ef5 100644 --- a/src/gamestatus.cpp +++ b/src/gamestatus.cpp @@ -79,7 +79,7 @@ class team_builder { team_builder(const config& side_cfg, const std::string &save_id, std::vector& teams, const config& level, gamemap& map, unit_map& units, - bool snapshot, const config &starting_pos) + const config &starting_pos) : gold_info_ngold_(0) , leader_configs_() , level_(level) @@ -89,7 +89,6 @@ class team_builder { , seen_ids_() , side_(0) , side_cfg_(side_cfg) - , snapshot_(snapshot) , starting_pos_(starting_pos) , t_(NULL) , teams_(teams) @@ -145,7 +144,6 @@ class team_builder { std::set seen_ids_; int side_; const config &side_cfg_; - bool snapshot_; const config &starting_pos_; team *t_; std::vector &teams_; @@ -493,9 +491,9 @@ void game_data::write_config(config_writer& out){ team_builder_ptr game_data::create_team_builder(const config& side_cfg, std::string save_id, std::vector& teams, const config& level, gamemap& map, unit_map& units, - bool snapshot, const config& starting_pos) + const config& starting_pos) { - return team_builder_ptr(new team_builder(side_cfg,save_id,teams,level,map,units,snapshot,starting_pos)); + return team_builder_ptr(new team_builder(side_cfg, save_id, teams, level, map, units, starting_pos)); } void game_data::build_team_stage_one(team_builder_ptr tb_ptr) diff --git a/src/gamestatus.hpp b/src/gamestatus.hpp index 7578ea6f2055..58aa5341ded1 100644 --- a/src/gamestatus.hpp +++ b/src/gamestatus.hpp @@ -92,7 +92,7 @@ class game_data : public variable_set { //create an object responsible for creating and populating a team from a config team_builder_ptr create_team_builder(const config& side_cfg, std::string save_id , std::vector& teams, const config& level, gamemap& map - , unit_map& units, bool snapshot, const config& starting_pos); + , unit_map& units, const config& starting_pos); //do first stage of team initialization (everything except unit placement) void build_team_stage_one(team_builder_ptr tb_ptr); diff --git a/src/play_controller.cpp b/src/play_controller.cpp index 4c5f8edd45b8..212b2d380124 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -183,8 +183,6 @@ void play_controller::init(CVideo& video){ // If i am wrong, use random_new_deterministic recorder.set_skip(false); - bool snapshot = level_["snapshot"].to_bool(); - if (level_["modify_placing"].to_bool()) { LOG_NG << "modifying placing..." << std::endl; place_sides_in_preferred_locations(); @@ -223,7 +221,7 @@ void play_controller::init(CVideo& video){ } } team_builder_ptr tb_ptr = gamedata_.create_team_builder(side, - save_id, gameboard_.teams_, level_, gameboard_.map_, gameboard_.units_, snapshot, gamestate_.replay_start()); + save_id, gameboard_.teams_, level_, gameboard_.map_, gameboard_.units_, gamestate_.replay_start()); ++team_num; gamedata_.build_team_stage_one(tb_ptr); team_builders.push_back(tb_ptr);