Merge branch 'master' into jgrpp

# Conflicts: # src/saveload/afterload.cpp
2021-11-20 13:15:32 +00:00
parent 5723c317f7 ad90e88ebd
commit 0691b25e17
14 changed files with 35 additions and 23 deletions
--- 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.