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

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/04/30 13:47:22

Modified files:
        .              : changelog 
        src            : unit.cpp 

Log message:
        Removed sorting of unit traits in display -- it was making 
quick,resilient 34 HP Elvish Archers look just like resilient,quick 33 HP ones.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.632&tr2=1.633&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.149&tr2=1.150&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.632 wesnoth/changelog:1.633
--- wesnoth/changelog:1.632     Fri Apr 29 21:27:43 2005
+++ wesnoth/changelog   Sat Apr 30 13:47:22 2005
@@ -5,6 +5,7 @@
    * reduced required width of weapon area in help
    * better diagnostics on parsing: file inclusion sequence
    * fixed items appearing in traits description (#12603)
+   * preserve order of unit traits so no more quick,resilient but 33 vs 34 HP
  * campaign improvements:
    * fix Dacyn not being [recall]-ed in Unexpected Appearance (Eastern 
Invasion) (#10619)
    * new map and scenario modification for Drowned Plains (Eastern Invasion)
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.149 wesnoth/src/unit.cpp:1.150
--- wesnoth/src/unit.cpp:1.149  Fri Apr 29 21:37:26 2005
+++ wesnoth/src/unit.cpp        Sat Apr 30 13:47:22 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.149 2005/04/29 21:37:26 silene Exp $ */
+/* $Id: unit.cpp,v 1.150 2005/04/30 13:47:22 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1213,7 +1213,9 @@
        std::vector< t_string >::iterator k = traits.begin(), k_end = 
traits.end();
        if (k != k_end) {
                // we want to make sure the traits always have a consistent 
ordering
-               std::sort(k, k_end);
+               // try out not sorting, since quick,resilient can give
+               // different HP to resilient,quick so rather preserve order
+               // std::sort(k, k_end);
                for(;;) {
                        traitsDescription_ += *(k++);
                        if (k == k_end) break;