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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/05/13 07:41:08

Modified files:
        src            : playturn.cpp 

Log message:
        Fix corrupted heading when the second side is dead.

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

Patches:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.368 wesnoth/src/playturn.cpp:1.369
--- wesnoth/src/playturn.cpp:1.368      Tue May 10 22:15:57 2005
+++ wesnoth/src/playturn.cpp    Fri May 13 07:41:07 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.368 2005/05/10 22:15:57 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.369 2005/05/13 07:41:07 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1698,7 +1698,6 @@
 
 void turn_info::status_table()
 {
-       std::vector<std::string> items;
        std::stringstream heading;
        heading << HEADING_PREFIX << _("Leader") << COLUMN_SEPARATOR << ' ' << 
COLUMN_SEPARATOR
                << _("Gold") << COLUMN_SEPARATOR
@@ -1714,6 +1713,7 @@
        if(game_config::debug)
                heading << COLUMN_SEPARATOR << _("Gold");
 
+       std::vector<std::string> items;
        items.push_back(heading.str());
 
        const team& viewing_team = teams_[gui_.viewing_team()];
@@ -1739,11 +1739,13 @@
                std::stringstream str;
 
                const unit_map::const_iterator leader = team_leader(n+1,units_);
+               //output the number of the side first, and this will
+               //cause it to be displayed in the correct colour
                if(leader != units_.end()) {
                        str << IMAGE_PREFIX << leader->second.type().image() << 
COLUMN_SEPARATOR
                            << char(n+1) << leader->second.description() << 
COLUMN_SEPARATOR;
                } else {
-                       str << char(n+1) << '-' << COLUMN_SEPARATOR << 
char(n+1) << '-' << COLUMN_SEPARATOR;
+                       str << ' ' << COLUMN_SEPARATOR << char(n+1) << '-' << 
COLUMN_SEPARATOR;
                }
 
                if(enemy) {
@@ -1751,11 +1753,9 @@
                } else {
                        str << data.gold << COLUMN_SEPARATOR;
                }
-               //output the number of the side first, and this will
-               //cause it to be displayed in the correct colour
                str << data.villages << COLUMN_SEPARATOR
                    << data.units << COLUMN_SEPARATOR << data.upkeep << 
COLUMN_SEPARATOR
-                       << (data.net_income < 0 ? 
font::BAD_TEXT:font::NULL_MARKUP) << data.net_income;
+                   << (data.net_income < 0 ? font::BAD_TEXT : 
font::NULL_MARKUP) << data.net_income;
 
                if(game_config::debug)
                        str << COLUMN_SEPARATOR << teams_[n].gold();
@@ -2153,7 +2153,7 @@
 void turn_info::unit_list()
 {
        const std::string heading = std::string(1,HEADING_PREFIX) +
-                                   _("Type") + std::string(1, 
COLUMN_SEPARATOR) +
+                                   _("Type") + COLUMN_SEPARATOR +
                                    _("Name") + COLUMN_SEPARATOR +
                                    _("HP") + COLUMN_SEPARATOR +
                                    _("XP") + COLUMN_SEPARATOR +