diff options
| author | ludde <ludde@openttd.org> | 2005-07-15 18:30:13 +0000 |
|---|---|---|
| committer | ludde <ludde@openttd.org> | 2005-07-15 18:30:13 +0000 |
| commit | 3486e7e9d5d24e2e0595b7a8d517581b926b85cd (patch) | |
| tree | 77cbbb71361c4ceb1306dc06c65b6364221d6c2f /viewport.c | |
| parent | 157addf5e9d85e513355edb97d513443ba9c131f (diff) | |
| download | openttd-3486e7e9d5d24e2e0595b7a8d517581b926b85cd.tar.xz | |
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
- The formatting of the industry name can be controlled with the string STR_INDUSTRY_FORMAT.
Change: Changed several occurences of {STRING1} into {TOWN} to get rid of townnametype being used directly.
Diffstat (limited to 'viewport.c')
| -rw-r--r-- | viewport.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/viewport.c b/viewport.c index 1efc5d87a..44e8e557a 100644 --- a/viewport.c +++ b/viewport.c @@ -799,7 +799,9 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi) right > t->sign.left && left < t->sign.left + t->sign.width_1) { - AddStringToDraw(t->sign.left + 1, t->sign.top + 1, _patches.population_in_label ? STR_TOWN_LABEL_POP : STR_2001, t->townnametype, t->townnameparts, t->population); + AddStringToDraw(t->sign.left + 1, t->sign.top + 1, + _patches.population_in_label ? STR_TOWN_LABEL_POP : STR_TOWN_LABEL, + t->index, t->population, 0); } } } else if (dpi->zoom == 1) { @@ -813,7 +815,9 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi) right > t->sign.left && left < t->sign.left + t->sign.width_1*2) { - AddStringToDraw(t->sign.left + 1, t->sign.top + 1, _patches.population_in_label ? STR_TOWN_LABEL_POP : STR_2001, t->townnametype, t->townnameparts, t->population); + AddStringToDraw(t->sign.left + 1, t->sign.top + 1, + _patches.population_in_label ? STR_TOWN_LABEL_POP : STR_TOWN_LABEL, + t->index, t->population, 0); } } } else { @@ -828,8 +832,8 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi) right > t->sign.left && left < t->sign.left + t->sign.width_2*4) { - AddStringToDraw(t->sign.left + 5, t->sign.top + 1, STR_2002, t->townnametype, t->townnameparts, 0); - AddStringToDraw(t->sign.left + 1, t->sign.top - 3, STR_2003, t->townnametype, t->townnameparts, 0); + AddStringToDraw(t->sign.left + 5, t->sign.top + 1, STR_TOWN_LABEL_TINY_BLACK, t->index, 0, 0); + AddStringToDraw(t->sign.left + 1, t->sign.top - 3, STR_TOWN_LABEL_TINY_WHITE, t->index, 0, 0); } } } |