diff options
author | ludde <ludde@openttd.org> | 2005-07-15 14:53:44 +0000 |
---|---|---|
committer | ludde <ludde@openttd.org> | 2005-07-15 14:53:44 +0000 |
commit | 2fa79c9b4d140f78e5e6392aded7beebeec5c230 (patch) | |
tree | ae57d82a4f417509705d577ea29c99c80b9e579b /economy.c | |
parent | 8f71864bef912a9cd8b8f649c5acbe638d48fc24 (diff) | |
download | openttd-2fa79c9b4d140f78e5e6392aded7beebeec5c230.tar.xz |
(svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters
- Feature: [strgen] Allow changing the order of parameters in translated strings.
- Use {1:TOWN} syntax to set the order.
- Codechange: [strgen] Rewrote lots of strgen internals.
Diffstat (limited to 'economy.c')
-rw-r--r-- | economy.c | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -807,23 +807,20 @@ Pair SetupSubsidyDecodeParam(Subsidy *s, bool mode) SetDParam(1, STR_2029); i = GetIndustry(s->from); tile = i->xy; - SetDParam(2, i->town->townnametype); - SetDParam(3, i->town->townnameparts); - - SetDParam(4, i->type + STR_4802_COAL_MINE); + SetDParam(2, i->town->index); + SetDParam(3, i->type + STR_4802_COAL_MINE); if (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD) { - SetDParam(5, STR_2029); + SetDParam(4, STR_2029); i = GetIndustry(s->to); tile2 = i->xy; - SetDParam(8, i->type + STR_4802_COAL_MINE); - SetDParam(6, i->town->townnametype); - SetDParam(7, i->town->townnameparts); + SetDParam(5, i->town->index); + SetDParam(6, i->type + STR_4802_COAL_MINE); } else { t = GetTown(s->to); tile2 = t->xy; - SetDParam(5, t->townnametype); - SetDParam(6, t->townnameparts); + SetDParam(4, t->townnametype); + SetDParam(5, t->townnameparts); } } else { t = GetTown(s->from); @@ -833,8 +830,8 @@ Pair SetupSubsidyDecodeParam(Subsidy *s, bool mode) t = GetTown(s->to); tile2 = t->xy; - SetDParam(3, t->townnametype); - SetDParam(4, t->townnameparts); + SetDParam(4, t->townnametype); + SetDParam(5, t->townnameparts); } } else { st = GetStation(s->from); |