diff options
| author | Jonathan G Rennison <j.g.rennison@gmail.com> | 2021-11-16 22:48:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 22:48:21 +0000 |
| commit | fc58ed9987a24785213a24c8c5d27f3b39c156ae (patch) | |
| tree | d722376206bff3d705bf1663f35bb075a695d430 | |
| parent | cf16f452da6d1cc8d4777ea4021d0c29b5679835 (diff) | |
| download | openttd-fc58ed9987a24785213a24c8c5d27f3b39c156ae.tar.xz | |
Codechange: Remove CargoSpec::multipliertowngrowth which is unused (#9701)
This is set by cargo property 19.
This property is only implemented in TTDPatch.
| -rw-r--r-- | src/cargotype.h | 1 | ||||
| -rw-r--r-- | src/newgrf.cpp | 2 | ||||
| -rw-r--r-- | src/table/cargo_const.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/cargotype.h b/src/cargotype.h index 5ed9ac90e..22c1bf7f5 100644 --- a/src/cargotype.h +++ b/src/cargotype.h @@ -66,7 +66,6 @@ struct CargoSpec { bool is_freight; ///< Cargo type is considered to be freight (affects train freight multiplier). TownEffect town_effect; ///< The effect that delivering this cargo type has on towns. Also affects destination of subsidies. - uint16 multipliertowngrowth; ///< Size of the effect. uint8 callback_mask; ///< Bitmask of cargo callbacks that have to be called StringID name; ///< Name of this type of cargo. diff --git a/src/newgrf.cpp b/src/newgrf.cpp index d1352d02e..ef13e5545 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3019,7 +3019,7 @@ static ChangeInfoResult CargoChangeInfo(uint cid, int numinfo, int prop, ByteRea } case 0x19: // Town growth coefficient - cs->multipliertowngrowth = buf->ReadWord(); + buf->ReadWord(); break; case 0x1A: // Bitmask of callbacks to use diff --git a/src/table/cargo_const.h b/src/table/cargo_const.h index bb6f811a9..8fffc8e80 100644 --- a/src/table/cargo_const.h +++ b/src/table/cargo_const.h @@ -44,7 +44,7 @@ * @param classes Classes of this cargo type. @see CargoClass */ #define MK(bt, label, colour, weight, mult, ip, td1, td2, freight, te, str_plural, str_singular, str_volume, classes) \ - {bt, label, colour, colour, weight, mult, ip, {td1, td2}, freight, te, 0, 0, \ + {bt, label, colour, colour, weight, mult, ip, {td1, td2}, freight, te, 0, \ MK_STR_CARGO_PLURAL(str_plural), MK_STR_CARGO_SINGULAR(str_singular), str_volume, MK_STR_QUANTITY(str_plural), MK_STR_ABBREV(str_plural), \ MK_SPRITE(str_plural), classes, nullptr, nullptr, 0} |