remove num_turns parameter

this was always equal to level["turns"].to_int(-1) so i replaced it with that.

src/editor/map/map_context.cpp

@@ -277,7 +277,7 @@ void map_context::load_scenario(const config& game_config)
 
 	labels_.read(scenario);
 
-	tod_manager_.reset(new tod_manager(scenario, scenario["turns"].to_int(-1)));
+	tod_manager_.reset(new tod_manager(scenario));
 	BOOST_FOREACH(const config &time_area, scenario.child_range("time_area")) {
 		tod_manager_->add_time_area(time_area);
 	}

src/game_display.cpp

@@ -88,7 +88,7 @@ game_display* game_display::create_dummy_display(CVideo& video)
 	static unit_map dummy_umap;
 	static config dummy_cfg;
 	static gamemap dummy_map(dummy_cfg, "");
-	static tod_manager dummy_tod(dummy_cfg, 0);
+	static tod_manager dummy_tod(dummy_cfg);
 	static std::vector<team> dummy_teams;
 	return new game_display(dummy_umap, video, dummy_map, dummy_tod,
 			dummy_teams, dummy_cfg, dummy_cfg);

src/multiplayer_connect_engine.cpp

@@ -325,7 +325,7 @@ void connect_engine::update_and_send_diff(bool update_time_of_day)
 
 	if (update_time_of_day) {
 		// Set random start ToD.
-		tod_manager tod_mng(level_, level_["turns"]);
+		tod_manager tod_mng(level_);
 	}
 
 	config diff = level_.get_diff(old_level);

src/play_controller.cpp

@@ -89,7 +89,7 @@ static void clear_resources()
 
 
 play_controller::play_controller(const config& level, game_state& state_of_game,
-		const int ticks, const int num_turns, const config& game_config,
+		const int ticks, const config& game_config,
 		CVideo& video, bool skip_replay) :
 	controller_base(ticks, game_config, video),
 	observer(),
@@ -104,7 +104,7 @@ play_controller::play_controller(const config& level, game_state& state_of_game,
 	mouse_handler_(NULL, teams_, units_, map_),
 	menu_handler_(NULL, units_, teams_, level, map_, game_config, state_of_game),
 	soundsources_manager_(),
-	tod_manager_(level, num_turns),
+	tod_manager_(level),
 	pathfind_manager_(),
 	persist_(),
 	gui_(),

src/play_controller.hpp

@@ -71,7 +71,7 @@ class play_controller : public controller_base, public events::observer, public
 {
 public:
 	play_controller(const config& level, game_state& state_of_game,
-		const int ticks, const int num_turns, const config& game_config,
+		const int ticks, const config& game_config,
 		CVideo& video, bool skip_replay);
 	virtual ~play_controller();
 

src/playcampaign.cpp

@@ -280,15 +280,14 @@ static LEVEL_RESULT playsingle_scenario(const config& game_config,
 		bool skip_replay, end_level_data &end_level)
 {
 	const int ticks = SDL_GetTicks();
-	int num_turns = (*level)["turns"].to_int(-1);
 
 	config init_level = *level;
 	do_carryover_WML(init_level, state_of_game);
 	team_init(init_level, state_of_game);
 	clear_carryover_WML(state_of_game);
 
 	LOG_NG << "creating objects... " << (SDL_GetTicks() - ticks) << "\n";
-	playsingle_controller playcontroller(init_level, state_of_game, ticks, num_turns, game_config, disp.video(), skip_replay);
+	playsingle_controller playcontroller(init_level, state_of_game, ticks, game_config, disp.video(), skip_replay);
 	LOG_NG << "created objects... " << (SDL_GetTicks() - playcontroller.get_ticks()) << "\n";
 
 	LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
@@ -335,14 +334,13 @@ static LEVEL_RESULT playmp_scenario(const config& game_config,
 		bool blindfold_replay, io_type_t& io_type, end_level_data &end_level)
 {
 	const int ticks = SDL_GetTicks();
-	int num_turns = (*level)["turns"].to_int(-1);
 
 	config init_level = *level;
 	do_carryover_WML(init_level, state_of_game);
 	team_init(init_level, state_of_game);
 	clear_carryover_WML(state_of_game);
 
-	playmp_controller playcontroller(init_level, state_of_game, ticks, num_turns,
+	playmp_controller playcontroller(init_level, state_of_game, ticks,
 		game_config, disp.video(), skip_replay, blindfold_replay, io_type == IO_SERVER);
 	LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
 	end_level = playcontroller.get_end_level_data_const();

src/playmp_controller.cpp

@@ -37,10 +37,9 @@ static lg::log_domain log_engine("engine");
 unsigned int playmp_controller::replay_last_turn_ = 0;
 
 playmp_controller::playmp_controller(const config& level,
-		game_state& state_of_game, const int ticks,
-		const int num_turns, const config& game_config, CVideo& video,
+		game_state& state_of_game, const int ticks, const config& game_config, CVideo& video,
 		bool skip_replay, bool blindfold_replay_, bool is_host) :
-	playsingle_controller(level, state_of_game, ticks, num_turns,
+	playsingle_controller(level, state_of_game, ticks,
 		game_config, video, skip_replay || blindfold_replay_), //this || means that if blindfold is enabled, quick replays will be on.
 	beep_warning_time_(0),
 	network_processing_stopped_(false),

src/playmp_controller.hpp

@@ -24,7 +24,7 @@ class playmp_controller : public playsingle_controller, public events::pump_moni
 {
 public:
 	playmp_controller(const config& level, game_state& state_of_game,
-		const int ticks, const int num_turns, const config& game_config, CVideo& video,
+		const int ticks, const config& game_config, CVideo& video,
 		bool skip_replay, bool blindfold_replay, bool is_host);
 	virtual ~playmp_controller();
 

src/playsingle_controller.cpp

@@ -63,9 +63,9 @@ static lg::log_domain log_enginerefac("enginerefac");
 #define LOG_RG LOG_STREAM(info, log_enginerefac)
 
 playsingle_controller::playsingle_controller(const config& level,
-		game_state& state_of_game, const int ticks, const int num_turns,
+		game_state& state_of_game, const int ticks,
 		const config& game_config, CVideo& video, bool skip_replay) :
-	play_controller(level, state_of_game, ticks, num_turns, game_config, video, skip_replay),
+	play_controller(level, state_of_game, ticks, game_config, video, skip_replay),
 	cursor_setter(cursor::NORMAL),
 	textbox_info_(),
 	replay_sender_(recorder),

src/playsingle_controller.hpp

@@ -25,7 +25,7 @@ class playsingle_controller : public play_controller
 {
 public:
 	playsingle_controller(const config& level, game_state& state_of_game,
-		const int ticks, const int num_turns, const config& game_config, CVideo& video, bool skip_replay);
+		const int ticks, const config& game_config, CVideo& video, bool skip_replay);
 	virtual ~playsingle_controller();
 
 	LEVEL_RESULT play_scenario(const config::const_child_itors &story,

src/replay_controller.cpp

@@ -44,15 +44,14 @@ LEVEL_RESULT play_replay_level(const config& game_config,
 {
 	try{
 		const int ticks = SDL_GetTicks();
-		int num_turns = (*level)["turns"].to_int(-1);
 
 		config init_level = *level;
 		carryover_info sides(state_of_game.carryover_sides);
 		sides.transfer_to(init_level);
 		state_of_game.carryover_sides = sides.to_config();
 
 		DBG_NG << "creating objects... " << (SDL_GetTicks() - ticks) << "\n";
-		replay_controller replaycontroller(init_level, state_of_game, ticks, num_turns, game_config, video);
+		replay_controller replaycontroller(init_level, state_of_game, ticks, game_config, video);
 		DBG_NG << "created objects... " << (SDL_GetTicks() - replaycontroller.get_ticks()) << "\n";
 		const events::command_disabler disable_commands;
 
@@ -74,13 +73,13 @@ LEVEL_RESULT play_replay_level(const config& game_config,
 }
 
 replay_controller::replay_controller(const config& level,
-		game_state& state_of_game, const int ticks, const int num_turns,
+		game_state& state_of_game, const int ticks,
 		const config& game_config, CVideo& video) :
-	play_controller(level, state_of_game, ticks, num_turns, game_config, video, false),
+	play_controller(level, state_of_game, ticks, game_config, video, false),
 	teams_start_(teams_),
 	gamestate_start_(gamestate_),
 	units_start_(units_),
-	tod_manager_start_(level, num_turns),
+	tod_manager_start_(level),
 	current_turn_(1),
 	is_playing_(false),
 	show_everything_(false),

src/replay_controller.hpp

@@ -28,7 +28,7 @@ class replay_controller : public play_controller
 {
 public:
 	replay_controller(const config& level, game_state& state_of_game,
-		const int ticks, const int num_turns, const config& game_config, CVideo& video);
+		const int ticks, const config& game_config, CVideo& video);
 	virtual ~replay_controller();
 
 	virtual bool can_execute_command(const hotkey::hotkey_command& command, int index=-1) const;

src/tod_manager.cpp

@@ -29,13 +29,13 @@
 static lg::log_domain log_engine("engine");
 #define LOG_NG LOG_STREAM(info, log_engine)
 
-tod_manager::tod_manager(const config& scenario_cfg, const int num_turns):
+tod_manager::tod_manager(const config& scenario_cfg):
 	savegame_config(),
 	currentTime_(0),
 	times_(),
 	areas_(),
 	turn_(scenario_cfg["turn_at"].to_int(1)),
-	num_turns_(num_turns)
+	num_turns_(scenario_cfg["turns"].to_int(-1))
 {
 
 	time_of_day::parse_times(scenario_cfg,times_);

src/tod_manager.hpp

@@ -27,7 +27,7 @@ class unit_map;
 class tod_manager : public savegame::savegame_config
 {
 	public:
-	explicit tod_manager(const config& scenario_cfg = config(), const int num_turns = -1);
+	explicit tod_manager(const config& scenario_cfg = config());
 		~tod_manager() {}
 		tod_manager& operator=(const tod_manager& manager);