Author: ai0867
Date: Mon Nov 7 00:18:26 2011
New Revision: 51904
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51904&view=rev
Log:
Make status report and tool bar use (half)_signed_value
Modified:
trunk/src/menu_events.cpp
trunk/src/playsingle_controller.cpp
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=51904&r1=51903&r2=51904&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Mon Nov 7 00:18:26 2011
@@ -452,11 +452,11 @@
}
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 @@
}
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());
}
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=51904&r1=51903&r2=51904&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Mon Nov 7 00:18:26 2011
@@ -273,9 +273,9 @@
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;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
