cpp/openttd-patchpack/source Changeset - r23682:d65b8fe9f89d

Changeset - r23682:d65b8fe9f89d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Charles Pigott - 5 years ago 2019-04-22 21:57:37
charlespigott@googlemail.com

Codechange: Remove DistributionTypeByte

2 files changed with 11 insertions and 12 deletions:

src/linkgraph/linkgraph_type.h

src/settings_type.h

0 comments (0 inline, 0 general)

src/linkgraph/linkgraph_type.h

➞

Show inline comments

@@ @@ -21,7 +21,7 @@ static const LinkGraphID INVALID_LINK_GR @@
 typedef uint16 NodeID;
 static const NodeID INVALID_NODE = UINT16_MAX;
 enum DistributionType {
+enum DistributionType : byte {
 	DT_BEGIN = 0,
 	DT_MIN = 0,
 	DT_MANUAL = 0,           ///< Manual distribution. No link graph calculations are run.
@@ @@ -37,7 +37,6 @@ enum DistributionType { @@
  * Define basic enum properties
  */
 template <> struct EnumPropsT<DistributionType> : MakeEnumPropsT<DistributionType, byte, DT_BEGIN, DT_END, DT_NUM> {};
 typedef TinyEnumT<DistributionType> DistributionTypeByte; // typedefing-enumification of DistributionType
 /**
  * Special modes for updating links. 'Restricted' means that vehicles with

src/settings_type.h

➞

Show inline comments

@@ @@ -493,16 +493,16 @@ struct EconomySettings { @@
 };
 struct LinkGraphSettings {
 	uint16 recalc_time;                         ///< time (in days) for recalculating each link graph component.
 	uint16 recalc_interval;                     ///< time (in days) between subsequent checks for link graphs to be calculated.
 	DistributionTypeByte distribution_pax;      ///< distribution type for passengers
 	DistributionTypeByte distribution_mail;     ///< distribution type for mail
 	DistributionTypeByte distribution_armoured; ///< distribution type for armoured cargo class
 	DistributionTypeByte distribution_default;  ///< distribution type for all other goods
 	uint8 accuracy;                             ///< accuracy when calculating things on the link graph. low accuracy => low running time
 	uint8 demand_size;                          ///< influence of supply ("station size") on the demand function
 	uint8 demand_distance;                      ///< influence of distance between stations on the demand function
 	uint8 short_path_saturation;                ///< percentage up to which short paths are saturated before saturating most capacious paths
 	uint16 recalc_time;                     ///< time (in days) for recalculating each link graph component.
 	uint16 recalc_interval;                 ///< time (in days) between subsequent checks for link graphs to be calculated.
 	DistributionType distribution_pax;      ///< distribution type for passengers
 	DistributionType distribution_mail;     ///< distribution type for mail
 	DistributionType distribution_armoured; ///< distribution type for armoured cargo class
 	DistributionType distribution_default;  ///< distribution type for all other goods
 	uint8 accuracy;                         ///< accuracy when calculating things on the link graph. low accuracy => low running time
 	uint8 demand_size;                      ///< influence of supply ("station size") on the demand function
 	uint8 demand_distance;                  ///< influence of distance between stations on the demand function
 	uint8 short_path_saturation;            ///< percentage up to which short paths are saturated before saturating most capacious paths
 	inline DistributionType GetDistributionType(CargoID cargo) const {
 		if (IsCargoInClass(cargo, CC_PASSENGERS)) return this->distribution_pax;

0 comments (0 inline, 0 general)