From 74e1230b9af8b0f0387c5d0eb0f8201784a73d1e Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Sat, 14 Jun 2014 21:51:45 -0400 Subject: [PATCH] delete duplicated set_team fcn game_display and display versions of set_team were identical, in header and in implementation, so we simply delete the game_display one, as a strict refactor. --- src/game_display.cpp | 19 ------------------- src/game_display.hpp | 1 - 2 files changed, 20 deletions(-) diff --git a/src/game_display.cpp b/src/game_display.cpp index ea5be1ac64a4..3711a1de32b6 100644 --- a/src/game_display.cpp +++ b/src/game_display.cpp @@ -991,25 +991,6 @@ void game_display::send_notification(const std::string& /*owner*/, const std::st #endif } -void game_display::set_team(size_t teamindex, bool show_everything) -{ - assert(teamindex < dc_->teams().size()); - currentTeam_ = teamindex; - if (!show_everything) - { - labels().set_team(&dc_->teams()[teamindex]); - viewpoint_ = &dc_->teams()[teamindex]; - } - else - { - labels().set_team(NULL); - viewpoint_ = NULL; - } - labels().recalculate_labels(); - if(boost::shared_ptr w = wb_.lock()) - w->on_viewer_change(teamindex); -} - void game_display::set_playing_team(size_t teamindex) { assert(teamindex < dc_->teams().size()); diff --git a/src/game_display.hpp b/src/game_display.hpp index 1e5165d88354..4052baf0a074 100644 --- a/src/game_display.hpp +++ b/src/game_display.hpp @@ -237,7 +237,6 @@ class game_display : public display * Data from this team will be displayed in the game status. * set_playing_team sets the team whose turn it currently is */ - void set_team(size_t team, bool observe=false); void set_playing_team(size_t team);