mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10628) -Fix (r10606,FS#1055): Revert r10606 and fix the plural problem another way.

release/0.6
peter1138 2007-07-19 17:28:55 +00:00
parent 58a3b5e60d
commit d93fcea1f8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargotype.h
View File

@ -33,8 +33,8 @@ struct CargoSpec {
uint16 multipliertowngrowth; uint16 multipliertowngrowth;
uint8 callback_mask; uint8 callback_mask;
StringID name_plural;
StringID name; StringID name;
StringID name_single;
StringID units_volume; StringID units_volume;
StringID quantifier; StringID quantifier;
StringID abbrev; StringID abbrev;

2
src/economy.cpp
View File

@ -871,7 +871,7 @@ Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode)
/* if mode is false, use the singular form */ /* if mode is false, use the singular form */
const CargoSpec *cs = GetCargo(s->cargo_type); 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 (s->age < 12) {
if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) { if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) {

6
src/newgrf.cpp
View File

@ -1532,11 +1532,11 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
break; break;
case 0x09: /* String ID for cargo type name */ case 0x09: /* String ID for cargo type name */
cs->name_plural = grf_load_word(&buf); cs->name = grf_load_word(&buf);
break; break;
case 0x0A: /* String for 1 unit of cargo */ case 0x0A: /* String for 1 unit of cargo */
cs->name = grf_load_word(&buf); cs->name_single = grf_load_word(&buf);
break; break;
case 0x0B: case 0x0B:
@ -5259,7 +5259,7 @@ static void MapNewCargoStrings()
if (!cs->IsValid() || cs->grfid == 0) continue; if (!cs->IsValid() || cs->grfid == 0) continue;
cs->name = MapGRFStringID(cs->grfid, cs->name); 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->units_volume = MapGRFStringID(cs->grfid, cs->units_volume);
cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier); cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier);
cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev); cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev);