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

In the damage type tooltip, if 2 unit types had same same name...

Browse source 
...and same resistance then both names were uselessly displayed. Now
show only once.
This commit is contained in:
Ali El Gariani 2010-05-13 14:01:20 +00:00
parent b238ce5023
commit 1d1bc9d18d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/generate_report.cpp
View file

@ -367,7 +367,7 @@ report generate_report(TYPE type,
// show this weapon's bonus against all the different units.
// Don't show invisible units, except if they are in our team or allied.
std::set<std::string> seen_units;
std::map<int,std::vector<std::string> > resistances;
std::map<int,std::set<std::string> > resistances;
for(unit_map::const_iterator u_it = units.begin(); u_it != units.end(); ++u_it) {
if (teams[team_index].is_enemy(u_it->side()) &&
!current_team.fogged(u_it->get_location()) &&
@ -377,14 +377,14 @@ report generate_report(TYPE type,
{
seen_units.insert(u_it->type_id());
int resistance = u_it->resistance_against(at, false, u_it->get_location()) - 100;
resistances[resistance].push_back(u_it->type_name());
resistances[resistance].insert(u_it->type_name());
}
}
for(std::map<int,std::vector<std::string> >::reverse_iterator resist = resistances.rbegin(); resist != resistances.rend(); ++resist) {
std::sort(resist->second.begin(),resist->second.end());
for(std::map<int,std::set<std::string> >::reverse_iterator resist = resistances.rbegin(); resist != resistances.rend(); ++resist) {
//std::sort(resist->second.begin(),resist->second.end());
tooltip << signed_percent(resist->first) << " " << _("vs") << " ";
for(std::vector<std::string>::const_iterator i = resist->second.begin(); i != resist->second.end(); ++i) {
for(std::set<std::string>::const_iterator i = resist->second.begin(); i != resist->second.end(); ++i) {
if(i != resist->second.begin()) {
tooltip << ", ";
}