Mercurial > hg > openttd
changeset 7287:93dc4159295a draft
(svn r10628) -Fix (r10606,FS#1055): Revert r10606 and fix the plural problem another way.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Thu, 19 Jul 2007 17:28:55 +0000 |
parents | b2173a6f24eb |
children | 6daddeff0236 |
files | src/cargotype.h src/economy.cpp src/newgrf.cpp |
diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cargotype.h +++ b/src/cargotype.h @@ -33,8 +33,8 @@ uint16 multipliertowngrowth; uint8 callback_mask; - StringID name_plural; StringID name; + StringID name_single; StringID units_volume; StringID quantifier; StringID abbrev;
--- a/src/economy.cpp +++ b/src/economy.cpp @@ -871,7 +871,7 @@ /* if mode is false, use the singular form */ const CargoSpec *cs = GetCargo(s->cargo_type); - SetDParam(0, mode ? cs->name_plural : cs->name); + SetDParam(0, mode ? cs->name : cs->name_single); if (s->age < 12) { if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) {
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -1532,11 +1532,11 @@ break; case 0x09: /* String ID for cargo type name */ - cs->name_plural = grf_load_word(&buf); + cs->name = grf_load_word(&buf); break; case 0x0A: /* String for 1 unit of cargo */ - cs->name = grf_load_word(&buf); + cs->name_single = grf_load_word(&buf); break; case 0x0B: @@ -5259,7 +5259,7 @@ if (!cs->IsValid() || cs->grfid == 0) continue; cs->name = MapGRFStringID(cs->grfid, cs->name); - cs->name_plural = MapGRFStringID(cs->grfid, cs->name_plural); + cs->name_single = MapGRFStringID(cs->grfid, cs->name_single); cs->units_volume = MapGRFStringID(cs->grfid, cs->units_volume); cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier); cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev);