0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eliminate unnecessary argument in play_controller

Browse source 
This is a strict refactor within the parameters of the program.
This commit is contained in:
Chris Beck 2014-05-30 22:18:48 -04:00
parent ef5417f60f
commit d86ff4d650
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/play_controller.cpp
View file

@ -1088,20 +1088,20 @@ const team& play_controller::current_team() const
return teams_[player_number_-1];
}
int play_controller::find_human_team_before(const size_t team_num) const
int play_controller::find_human_team_before_current_player() const
{
if (team_num > teams_.size())
if (player_number_ > int(teams_.size()))
return -2;
int human_side = -2;
for (int i = team_num-2; i > -1; --i) {
for (int i = player_number_-2; i >= 0; --i) {
if (teams_[i].is_human()) {
human_side = i;
break;
}
}
if (human_side == -2) {
for (size_t i = teams_.size()-1; i > team_num-1; --i) {
for (int i = teams_.size()-1; i > player_number_-1; --i) {
if (teams_[i].is_human()) {
human_side = i;
break;

4
src/play_controller.hpp
View file

@ -208,8 +208,8 @@ protected:
team& current_team();
const team& current_team() const;
/** Find a human team (ie one we own) starting backwards from 'team_num'. */
int find_human_team_before(const size_t team) const;
/** Find a human team (ie one we own) starting backwards from current player. */
int find_human_team_before_current_player() const;
//managers
boost::scoped_ptr<preferences::display_manager> prefs_disp_manager_;

4
src/playsingle_controller.cpp
View file

@ -704,7 +704,7 @@ void playsingle_controller::play_side()
// reset gui to prev human one
if (!teams_[player_number_-1].is_human()) {
browse_ = true;
int s = find_human_team_before(player_number_);
int s = find_human_team_before_current_player();
if (s <= 0)
s = gui_->playing_side();
update_gui_to_player(s-1);
@ -747,7 +747,7 @@ void playsingle_controller::play_side()
// reset gui to prev human one
if (!teams_[player_number_-1].is_human()) {
browse_ = true;
int s = find_human_team_before(player_number_);
int s = find_human_team_before_current_player();
if (s <= 0)
s = gui_->playing_side();
update_gui_to_player(s-1);