summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cargotype.h2
-rw-r--r--src/economy.cpp2
-rw-r--r--src/newgrf.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/cargotype.h b/src/cargotype.h
index b7a18c8b4..4c0702a6f 100644
--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -33,8 +33,8 @@ struct CargoSpec {
uint16 multipliertowngrowth;
uint8 callback_mask;
- StringID name_plural;
StringID name;
+ StringID name_single;
StringID units_volume;
StringID quantifier;
StringID abbrev;
diff --git a/src/economy.cpp b/src/economy.cpp
index 4f6136923..e3074fe00 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -871,7 +871,7 @@ Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode)
/* 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) {
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 1c53d34a1..d7a3d7af6 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1532,11 +1532,11 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
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 @@ static void MapNewCargoStrings()
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);