0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced hyphen-minus in gold counter with the Unicode minus.

Browse source
This commit is contained in:
Steven Panek 2011-10-03 02:17:28 +00:00
parent af7b92fcf3
commit 986310c93d
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/themes/default.cfg
View file

@ -170,7 +170,7 @@
[panel]
id=gold-panel
image=themes/status-bg.png
rect="+5,=,+71,="
rect="+5,=,+76,="
xanchor=fixed
yanchor=fixed
[/panel]
@ -586,7 +586,7 @@
[/change]
[change]
id=gold-panel
rect="+5,=,+61,="
rect="+5,=,+66,="
[/change]
[change]
id=villages-panel

4
data/themes/widescreen.cfg
View file

@ -204,7 +204,7 @@
[panel]
id=gold-panel
image=themes/status-bg.png
rect="+5,=,+71,="
rect="+5,=,+76,="
xanchor=fixed
yanchor=fixed
[/panel]
@ -815,7 +815,7 @@
[/change]
[change]
id=gold-panel
rect="+5,=,+61,="
rect="+5,=,+66,="
[/change]
[change]
id=villages-panel

20
src/reports.cpp
View file

@ -996,12 +996,24 @@ REPORT_GENERATOR(gold)
int fake_gold = (*resources::teams)[viewing_side - 1].gold() -
resources::whiteboard->get_spent_gold_for(viewing_side);
char const *end = naps;
if (viewing_side != resources::screen->playing_side())
str << span_color(font::GRAY_COLOR);
else if (fake_gold < 0)
if (viewing_side != resources::screen->playing_side()) {
if(fake_gold < 0) {
fake_gold = - fake_gold;
str << span_color(font::GRAY_COLOR);
str << utils::unicode_minus;
}
else {
str << span_color(font::GRAY_COLOR);
}
}
else if (fake_gold < 0) {
fake_gold = - fake_gold;
str << span_color(font::BAD_COLOR);
else
str << utils::unicode_minus;
}
else {
end = "";
}
str << fake_gold << end;
return text_report(str.str());
}