Make status report and tool bar use (half)_signed_value

This commit is contained in:
Alexander van Gessel 2011-11-07 00:18:26 +01:00
parent c9153c3cdd
commit 671bfedf1c
2 changed files with 5 additions and 5 deletions

View file

@ -452,11 +452,11 @@ void menu_handler::status_table(int selected)
}
if(game_config::debug) {
str << data.gold << COLUMN_SEPARATOR;
str << utils::half_signed_value(data.gold) << COLUMN_SEPARATOR;
} else if(enemy && viewing_team.uses_fog()) {
str << ' ' << COLUMN_SEPARATOR;
} else {
str << data.gold << COLUMN_SEPARATOR;
str << utils::half_signed_value(data.gold) << COLUMN_SEPARATOR;
}
str << data.villages;
if(!(viewing_team.uses_fog() || viewing_team.uses_shroud())) {
@ -464,7 +464,7 @@ void menu_handler::status_table(int selected)
}
str << 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) << utils::signed_value(data.net_income);
total_villages += data.villages;
items.push_back(str.str());
}

View file

@ -273,9 +273,9 @@ void playsingle_controller::report_victory(
report << '\n' << _("Carry over percentage: ") << end_level.carryover_percentage;
}
if(end_level.carryover_add) {
report << "\n<b>" << _("Bonus Gold: ") << player_gold <<"</b>";
report << "\n<b>" << _("Bonus Gold: ") << utils::half_signed_value(player_gold) <<"</b>";
} else {
report << "\n<b>" << _("Retained Gold: ") << player_gold << "</b>";
report << "\n<b>" << _("Retained Gold: ") << utils::half_signed_value(player_gold) << "</b>";
}
std::string goldmsg;