diff options
| author | peter1138 <peter1138@openttd.org> | 2007-07-17 20:32:27 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-07-17 20:32:27 +0000 |
| commit | bcc93b45bc7a2a6e01047cc30101e2528868065d (patch) | |
| tree | 242dfe3d1ce376bf89164481638e1925fba05b8e | |
| parent | 524e306650b3a62c7a539846dea3cf5114205172 (diff) | |
| download | openttd-bcc93b45bc7a2a6e01047cc30101e2528868065d.tar.xz | |
(svn r10606) -Fix (r8826): plural and single cargo names were mixed up.
| -rw-r--r-- | src/cargotype.h | 2 | ||||
| -rw-r--r-- | src/newgrf.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cargotype.h b/src/cargotype.h index 347f09427..b7a18c8b4 100644 --- a/src/cargotype.h +++ b/src/cargotype.h @@ -33,8 +33,8 @@ struct CargoSpec { uint16 multipliertowngrowth; uint8 callback_mask; - StringID name; StringID name_plural; + StringID name; StringID units_volume; StringID quantifier; StringID abbrev; diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 6c74edc0a..1c53d34a1 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 = grf_load_word(&buf); + cs->name_plural = grf_load_word(&buf); break; - case 0x0A: /* String for cargo name, plural */ - cs->name_plural = grf_load_word(&buf); + case 0x0A: /* String for 1 unit of cargo */ + cs->name = grf_load_word(&buf); break; case 0x0B: |