diff --git a/src/game_data.cpp b/src/game_data.cpp index accb05301aa..413f5e65c38 100644 --- a/src/game_data.cpp +++ b/src/game_data.cpp @@ -202,10 +202,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, - const config& starting_pos) + const config& level, gamemap& map, unit_map& units) { - return team_builder_ptr(new team_builder(side_cfg, save_id, teams, level, map, units, *this, starting_pos)); + return team_builder_ptr(new team_builder(side_cfg, save_id, teams, level, map, units, *this)); } void game_data::build_team_stage_one(team_builder_ptr tb_ptr) diff --git a/src/game_data.hpp b/src/game_data.hpp index 04dc0e61970..6decbe56543 100644 --- a/src/game_data.hpp +++ b/src/game_data.hpp @@ -99,7 +99,7 @@ public: //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, const config& starting_pos); + , unit_map& units); //do first stage of team initialization (everything except unit placement) void build_team_stage_one(team_builder_ptr tb_ptr); diff --git a/src/game_state.cpp b/src/game_state.cpp index 49caef17bb3..f8a21d966eb 100644 --- a/src/game_state.cpp +++ b/src/game_state.cpp @@ -134,7 +134,7 @@ static std::string get_unique_saveid(const config& cfg, std::set& s return save_id; } -void game_state::init(const int ticks, const config & replay_start) +void game_state::init(const int ticks) { if (level_["modify_placing"].to_bool()) { LOG_NG << "modifying placing..." << std::endl; @@ -170,7 +170,7 @@ void game_state::init(const int ticks, const config & replay_start) } } team_builder_ptr tb_ptr = gamedata_.create_team_builder(side, - save_id, board_.teams_, level_, *board_.map_, board_.units_, replay_start); + save_id, board_.teams_, level_, *board_.map_, board_.units_); ++team_num; gamedata_.build_team_stage_one(tb_ptr); team_builders.push_back(tb_ptr); diff --git a/src/game_state.hpp b/src/game_state.hpp index 9629ee901ad..cf418da6786 100644 --- a/src/game_state.hpp +++ b/src/game_state.hpp @@ -43,7 +43,7 @@ public: void place_sides_in_preferred_locations(); - void init(int ticks, const config & replay_start); + void init(int ticks); config to_config() const; diff --git a/src/play_controller.cpp b/src/play_controller.cpp index ef3c0d31d26..4108f1097bc 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -192,7 +192,7 @@ void play_controller::init(CVideo& video){ events_manager_.reset(new game_events::manager(level_)); LOG_NG << "initializing game_state..." << (SDL_GetTicks() - ticks_) << std::endl; - gamestate_.init(ticks_, saved_game_.replay_start()); + gamestate_.init(ticks_); resources::tunnels = gamestate_.pathfind_manager_.get(); // mouse_handler expects at least one team for linger mode to work.