[Wesnoth-cvs-commits] wesnoth ./changelog src/reports.cpp

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/04/21 19:36:34

Modified files:
        .              : changelog 
        src            : reports.cpp 

Log message:
        Fixed bug 12758, repeating gendered unit types in attack type tooltip

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.607&tr2=1.608&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.cpp.diff?tr1=1.63&tr2=1.64&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.607 wesnoth/changelog:1.608
--- wesnoth/changelog:1.607     Wed Apr 20 23:52:52 2005
+++ wesnoth/changelog   Thu Apr 21 19:36:34 2005
@@ -45,6 +45,7 @@
  * fixed user-campaigns not being translatable anymore
  * fixed the formatting of wrapped text lines being lost
  * added support for Home/End in menus, ctrl-a/e/u in textboxes
+ * fixed bug #12758: gendered unit types repeated in attack type tooltip
 
 Version 0.9.0:
  * user interface improvements:
Index: wesnoth/src/reports.cpp
diff -u wesnoth/src/reports.cpp:1.63 wesnoth/src/reports.cpp:1.64
--- wesnoth/src/reports.cpp:1.63        Tue Mar 22 23:42:37 2005
+++ wesnoth/src/reports.cpp     Thu Apr 21 19:36:34 2005
@@ -195,12 +195,12 @@
                        tooltip << lang_weapon << " (" << lang_type << ")\n";
 
                        //find all the unit types on the map, and show this 
weapon's bonus against all the different units
-                       std::set<const unit_type*> seen_units;
+                       std::set<std::string> seen_units;
                        std::map<int,std::vector<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->second.side()) && 
!current_team.fogged(u_it->first.x,u_it->first.y) &&
-                                  seen_units.count(&u_it->second.type()) == 0) 
{
-                                       seen_units.insert(&u_it->second.type());
+                                  seen_units.count(u_it->second.type().id()) 
== 0) {
+                                       
seen_units.insert(u_it->second.type().id());
                                        const int resistance = 
u_it->second.type().movement_type().resistance_against(*at_it) - 100;
                                        
resistances[resistance].push_back(u_it->second.type().language_name());
                                }