wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/src help.cpp


From: David White
Subject: [Wesnoth-cvs-commits] wesnoth/src help.cpp
Date: Mon, 30 May 2005 00:02:00 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/05/30 04:02:00

Modified files:
        src            : help.cpp 

Log message:
        made defense listed first in help before movement to be consistent with 
ordering shown elsewhere (fixes bug #10665)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.102&tr2=1.103&r1=text&r2=text

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.102 wesnoth/src/help.cpp:1.103
--- wesnoth/src/help.cpp:1.102  Sun May 29 20:56:12 2005
+++ wesnoth/src/help.cpp        Mon May 30 04:02:00 2005
@@ -1188,8 +1188,9 @@
                        std::vector<item> first_row;
                        table_spec table;
                        push_header(first_row, _("Terrain"));
-                       push_header(first_row, _("Movement"));
-                       push_header(first_row, _("Defense"));
+                       push_header(first_row, _("Defense"));
+                       push_header(first_row, _("Movement"));
+
                        table.push_back(first_row);
                        for (std::set<std::string>::const_iterator terrain_it =
                                         
preferences::encountered_terrains().begin(),
@@ -1210,17 +1211,22 @@
                                        row.push_back(std::make_pair(str.str(), 
                                                                     
font::line_width(name,
                                                                                
      normal_font_size)));
-                                       str.str(clear_stringstream);
-                                       if(moves < 100)
-                                               str << moves;
-                                       else
-                                               str << "--";
-                                       push_tab_pair(row, str.str());
+
+                                       //defense
                                        str.str(clear_stringstream);
                                        const int defense =
                                                100 - 
movement_type.defense_modifier(*map,terrain);
-                                       str << defense << "%";
-                                       push_tab_pair(row, str.str());
+                                       str << defense << "%";
+                                       push_tab_pair(row, str.str());
+
+                                       //movement
+                                       str.str(clear_stringstream);
+                                       if(moves < 100)
+                                               str << moves;
+                                       else
+                                               str << "--";
+                                       push_tab_pair(row, str.str());
+
                                        table.push_back(row);
                                }
                        }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]