refactor replay_controller in order to unfriend game_board

wesnoth · Jun 11, 2014 · 15ed9d1 · 15ed9d1
1 parent 4ffb237
commit 15ed9d1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/game_board.cpp b/src/game_board.cpp
@@ -83,6 +83,12 @@ void game_board::all_survivors_to_recall() {
 	}
 }
 
+void game_board::reset_all_teams_objectives_changes() {
+	BOOST_FOREACH(team & t, teams_) {
+		t.reset_objectives_changed();
+	}
+}
+
 unit_map::iterator game_board::find_visible_unit(const map_location &loc,
 	const team& current_team, bool see_all)
 {

diff --git a/src/game_board.hpp b/src/game_board.hpp
@@ -57,7 +57,6 @@ class game_board : public display_context {
 
 	//TODO: Remove these when we have refactored enough to make it possible.
 	friend class play_controller;
-	friend class replay_controller;
 	friend class playsingle_controller;
 	friend class playmp_controller;
 	friend class events::mouse_handler;
@@ -111,6 +110,8 @@ class game_board : public display_context {
 
 	void all_survivors_to_recall();
 
+	void reset_all_teams_objectives_changes();
+
 	// Manipulator from playturn
 
 	void side_drop_to (int side_num, team::CONTROLLER ctrl);

diff --git a/src/replay_controller.cpp b/src/replay_controller.cpp
@@ -159,9 +159,7 @@ void replay_controller::init_gui(){
 
 	gui_->scroll_to_leader(player_number_, display::WARP);
 	update_locker lock_display((*gui_).video(),false);
-	BOOST_FOREACH(team & t, gameboard_.teams_) {
-		t.reset_objectives_changed();
-	}
+	gameboard_.reset_all_teams_objectives_changes();
 
 	update_replay_ui();
 }
@@ -495,7 +493,7 @@ possible_end_play_signal replay_controller::play_turn(){
 	bool last_team = false;
 
 	while ( (!last_team) && (!recorder.at_end()) && is_playing_ ){
-		last_team = static_cast<size_t>(player_number_) == gameboard_.teams_.size();
+		last_team = static_cast<size_t>(player_number_) == gameboard_.teams().size();
 		PROPOGATE_END_PLAY_SIGNAL( play_side() );
 		HANDLE_END_PLAY_SIGNAL( play_slice() );
 	}
@@ -549,9 +547,9 @@ possible_end_play_signal replay_controller::play_side() {
 
 	player_number_++;
 
-	if (static_cast<size_t>(player_number_) > gameboard_.teams_.size()) {
-		//during the orginal game player_number_ would also be gameboard_.teams_.size(),
-		player_number_ = gameboard_.teams_.size();
+	if (static_cast<size_t>(player_number_) > gameboard_.teams().size()) {
+		//during the orginal game player_number_ would also be gameboard_.teams().size(),
+		player_number_ = gameboard_.teams().size();
 		finish_turn();
 		tod_manager_.next_turn();
 		it_is_a_new_turn_ = true;
@@ -572,7 +570,7 @@ possible_end_play_signal replay_controller::play_side() {
 void replay_controller::update_teams(){
 
 	int next_team = player_number_;
-	if(static_cast<size_t>(next_team) > gameboard_.teams_.size()) {
+	if(static_cast<size_t>(next_team) > gameboard_.teams().size()) {
 		next_team = 1;
 	}