remove play_controller::first_player_ member

src/play_controller.cpp

@@ -134,8 +134,7 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
 	, statistics_context_(new statistics::scenario_context(level["name"]))
 	, undo_stack_(new actions::undo_list(level.child("undo_stack")))
 	, replay_(new replay(state_of_game.get_replay()))
-	, player_number_(1)
-	, first_player_(level["playing_team"].to_int() + 1)
+	, player_number_(level["playing_team"].to_int() + 1)
 	, start_turn_(gamestate_.tod_manager_.turn()) // gamestate_.tod_manager_ constructed above
 	, skip_replay_(skip_replay)
 	, linger_(false)
@@ -431,7 +430,7 @@ void play_controller::init_side_end()
 {
 	const time_of_day &tod = gamestate_.tod_manager_.get_time_of_day();
 
-	if (player_number_ == first_player_)
+	if (player_number_ == 1 || !init_side_done_now_)
 		sound::play_sound(tod.sounds, sound::SOUND_SOURCES);
 
 	if (!is_skipping_replay()){

src/play_controller.hpp

@@ -273,7 +273,6 @@ class play_controller : public controller_base, public events::observer, public
 	boost::scoped_ptr<replay> replay_;
 
 	int player_number_;
-	int first_player_;
 	unsigned int start_turn_;
 	bool skip_replay_;
 	bool linger_;

src/playmp_controller.cpp

@@ -259,7 +259,6 @@ void playmp_controller::linger()
 		quit = true;
 		try {
 			// reimplement parts of play_side()
-			player_number_ = first_player_;
 			turn_data_.send_data();
 			end_turn_ = END_TURN_NONE;
 			play_linger_turn();

src/playsingle_controller.cpp

@@ -228,11 +228,12 @@ void playsingle_controller::play_scenario_main_loop() {
 	{
 		ERR_NG << "Playing game with 0 teams." << std::endl;
 	}
-	for(; ; first_player_ = 1) {
+	while(true) {
 		play_turn();
 		if (is_regular_game_end()) {
 			return;
 		}
+		player_number_ = 1;
 	} //end for loop
 }
 
@@ -384,7 +385,7 @@ void playsingle_controller::play_turn()
 		LOG_AIT << "Turn " << turn() << ":" << std::endl;
 	}
 
-	for (player_number_ = first_player_; player_number_ <= int(gamestate_.board_.teams().size()); ++player_number_)
+	for (; player_number_ <= int(gamestate_.board_.teams().size()); ++player_number_)
 	{
 		// If a side is empty skip over it.
 		if (current_team().is_empty()) continue;
@@ -606,8 +607,6 @@ void playsingle_controller::linger()
 		end_turn_enable(true);
 		end_turn_ = END_TURN_NONE;
 		while(end_turn_ == END_TURN_NONE) {
-			// Reset the team number to make sure we're the right team.
-			player_number_ = first_player_;
 			play_slice();
 			gui_->draw();
 		}

src/replay_controller.cpp

@@ -471,7 +471,7 @@ void replay_controller::play_replay()
 void replay_controller::play_replay_main_loop()
 {
 	DBG_REPLAY << "starting main loop\n" << (SDL_GetTicks() - ticks_) << "\n";
-	for(; !resources::recorder->at_end() && is_playing_; first_player_ = 1) {
+	while(!resources::recorder->at_end() && is_playing_) {
 		play_turn();
 	}
 }