Remove redundant argument from display_context::calculate_team_data()

wesnoth · Dec 10, 2016 · c71b930 · c71b930
1 parent d98525d
commit c71b930
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/display_context.cpp b/src/display_context.cpp
@@ -158,11 +158,11 @@ int display_context::side_upkeep(int side) const
 	return res;
 }
 
-team_data display_context::calculate_team_data(const team& tm, int side) const
+team_data display_context::calculate_team_data(const team& tm) const
 {
 	team_data res;
-	res.units = side_units(side);
-	res.upkeep = side_upkeep(side);
+	res.units = side_units(tm.side());
+	res.upkeep = side_upkeep(tm.side());
 	res.villages = tm.villages().size();
 	res.expenses = std::max<int>(0,res.upkeep - tm.support());
 	res.net_income = tm.total_income() - res.expenses;

diff --git a/src/display_context.hpp b/src/display_context.hpp
@@ -93,7 +93,7 @@ class display_context {
 
 	int side_upkeep(int side_num) const ;
 
-	team_data calculate_team_data(const class team& tm, int side) const;
+	team_data calculate_team_data(const class team& tm) const;
 
 	// Accessor from team.cpp
 

diff --git a/src/gui/dialogs/game_stats.cpp b/src/gui/dialogs/game_stats.cpp
@@ -59,7 +59,7 @@ game_stats::game_stats(const display_context& board, const int viewing_team, int
 	, selected_index_(selected_index)
 {
 	for(const auto& team : board_.teams()) {
-		team_data_.push_back(board_.calculate_team_data(team, team.side()));
+		team_data_.push_back(board_.calculate_team_data(team));
 	}
 }
 

diff --git a/src/reports.cpp b/src/reports.cpp
@@ -1261,7 +1261,7 @@ REPORT_GENERATOR(villages, rc)
 	std::ostringstream str;
 	int viewing_side = rc.screen().viewing_side();
 	const team &viewing_team = rc.teams()[viewing_side - 1];
-	team_data td = rc.dc().calculate_team_data(viewing_team, viewing_side);
+	team_data td = rc.dc().calculate_team_data(viewing_team);
 	str << td.villages << '/';
 	if (viewing_team.uses_shroud()) {
 		int unshrouded_villages = 0;
@@ -1286,7 +1286,7 @@ REPORT_GENERATOR(upkeep, rc)
 	std::ostringstream str;
 	int viewing_side = rc.screen().viewing_side();
 	const team &viewing_team = rc.teams()[viewing_side - 1];
-	team_data td = rc.dc().calculate_team_data(viewing_team, viewing_side);
+	team_data td = rc.dc().calculate_team_data(viewing_team);
 	str << td.expenses << " (" << td.upkeep << ")";
 	return gray_inactive(rc,str.str());
 }
@@ -1295,7 +1295,7 @@ REPORT_GENERATOR(expenses, rc)
 {
 	int viewing_side = rc.screen().viewing_side();
 	const team &viewing_team = rc.teams()[viewing_side - 1];
-	team_data td = rc.dc().calculate_team_data(viewing_team, rc.screen().viewing_side());
+	team_data td = rc.dc().calculate_team_data(viewing_team);
 	return gray_inactive(rc,std::to_string(td.expenses));
 }
 
@@ -1304,7 +1304,7 @@ REPORT_GENERATOR(income, rc)
 	std::ostringstream str;
 	int viewing_side = rc.screen().viewing_side();
 	const team &viewing_team = rc.teams()[viewing_side - 1];
-	team_data td = rc.dc().calculate_team_data(viewing_team, viewing_side);
+	team_data td = rc.dc().calculate_team_data(viewing_team);
 	char const *end = naps;
 	if (viewing_side != rc.screen().playing_side()) {
 		if (td.net_income < 0) {