mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: explicitly initialise Engine member variables

pull/13602/head
Rubidium 2025-02-17 22:55:49 +01:00 committed by rubidium42
parent bb81139c1f
commit 1f3198a395
2 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/engine_base.h
View File

@ -36,42 +36,42 @@ typedef Pool<Engine, EngineID, 64> EnginePool;
extern EnginePool _engine_pool; extern EnginePool _engine_pool;
struct Engine : EnginePool::PoolItem<&_engine_pool> { struct Engine : EnginePool::PoolItem<&_engine_pool> {
CompanyMask company_avail; ///< Bit for each company whether the engine is available for that company. CompanyMask company_avail{}; ///< Bit for each company whether the engine is available for that company.
CompanyMask company_hidden; ///< Bit for each company whether the engine is normally hidden in the build gui for that company. CompanyMask company_hidden{}; ///< Bit for each company whether the engine is normally hidden in the build gui for that company.
CompanyMask preview_asked; ///< Bit for each company which has already been offered a preview. CompanyMask preview_asked{}; ///< Bit for each company which has already been offered a preview.
std::string name; ///< Custom name of engine. std::string name{}; ///< Custom name of engine.
TimerGameCalendar::Date intro_date; ///< Date of introduction of the engine. TimerGameCalendar::Date intro_date{}; ///< Date of introduction of the engine.
int32_t age; ///< Age of the engine in months. int32_t age = 0; ///< Age of the engine in months.
uint16_t reliability; ///< Current reliability of the engine. uint16_t reliability = 0; ///< Current reliability of the engine.
uint16_t reliability_spd_dec; ///< Speed of reliability decay between services (per day). uint16_t reliability_spd_dec = 0; ///< Speed of reliability decay between services (per day).
uint16_t reliability_start; ///< Initial reliability of the engine. uint16_t reliability_start = 0; ///< Initial reliability of the engine.
uint16_t reliability_max; ///< Maximal reliability of the engine. uint16_t reliability_max = 0; ///< Maximal reliability of the engine.
uint16_t reliability_final; ///< Final reliability of the engine. uint16_t reliability_final = 0; ///< Final reliability of the engine.
uint16_t duration_phase_1; ///< First reliability phase in months, increasing reliability from #reliability_start to #reliability_max. uint16_t duration_phase_1 = 0; ///< First reliability phase in months, increasing reliability from #reliability_start to #reliability_max.
uint16_t duration_phase_2; ///< Second reliability phase in months, keeping #reliability_max. uint16_t duration_phase_2 = 0; ///< Second reliability phase in months, keeping #reliability_max.
uint16_t duration_phase_3; ///< Third reliability phase in months, decaying to #reliability_final. uint16_t duration_phase_3 = 0; ///< Third reliability phase in months, decaying to #reliability_final.
EngineFlags flags; ///< Flags of the engine. @see EngineFlags EngineFlags flags{}; ///< Flags of the engine. @see EngineFlags
CompanyID preview_company; ///< Company which is currently being offered a preview \c CompanyID::Invalid() means no company. CompanyID preview_company = CompanyID::Invalid(); ///< Company which is currently being offered a preview \c CompanyID::Invalid() means no company.
uint8_t preview_wait; ///< Daily countdown timer for timeout of offering the engine to the #preview_company company. uint8_t preview_wait = 0; ///< Daily countdown timer for timeout of offering the engine to the #preview_company company.
uint8_t original_image_index; ///< Original vehicle image index, thus the image index of the overridden vehicle uint8_t original_image_index = 0; ///< Original vehicle image index, thus the image index of the overridden vehicle
VehicleType type; ///< %Vehicle type, ie #VEH_ROAD, #VEH_TRAIN, etc. VehicleType type = VEH_INVALID; ///< %Vehicle type, ie #VEH_ROAD, #VEH_TRAIN, etc.
EngineDisplayFlags display_flags; ///< NOSAVE client-side-only display flags for build engine list. EngineDisplayFlags display_flags{}; ///< NOSAVE client-side-only display flags for build engine list.
EngineID display_last_variant; ///< NOSAVE client-side-only last variant selected. EngineID display_last_variant = EngineID::Invalid(); ///< NOSAVE client-side-only last variant selected.
EngineInfo info; EngineInfo info{};
union { union {
RailVehicleInfo rail; RailVehicleInfo rail;
RoadVehicleInfo road; RoadVehicleInfo road;
ShipVehicleInfo ship; ShipVehicleInfo ship;
AircraftVehicleInfo air; AircraftVehicleInfo air;
} u; } u{};
uint16_t list_position; uint16_t list_position = 0;
/* NewGRF related data */ /* NewGRF related data */
/** /**
@ -80,9 +80,9 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
* Used for obtaining the sprite offset of custom sprites, and for * Used for obtaining the sprite offset of custom sprites, and for
* evaluating callbacks. * evaluating callbacks.
*/ */
VariableGRFFileProps grf_prop; VariableGRFFileProps grf_prop{};
std::vector<WagonOverride> overrides; std::vector<WagonOverride> overrides{};
std::vector<BadgeID> badges; std::vector<BadgeID> badges{};
Engine() {} Engine() {}
Engine(VehicleType type, uint16_t local_id); Engine(VehicleType type, uint16_t local_id);

146
src/engine_type.h
View File

@ -44,42 +44,42 @@ enum EngineClass : uint8_t {
/** Information about a rail vehicle. */ /** Information about a rail vehicle. */
struct RailVehicleInfo { struct RailVehicleInfo {
uint8_t image_index; uint8_t image_index = 0;
RailVehicleTypes railveh_type; RailVehicleTypes railveh_type{};
uint8_t cost_factor; ///< Purchase cost factor; For multiheaded engines the sum of both engine prices. uint8_t cost_factor = 0; ///< Purchase cost factor; For multiheaded engines the sum of both engine prices.
RailType railtype; ///< Railtype, mangled if elrail is disabled. RailType railtype{}; ///< Railtype, mangled if elrail is disabled.
RailType intended_railtype; ///< Intended railtype, regardless of elrail being enabled or disabled. RailType intended_railtype{}; ///< Intended railtype, regardless of elrail being enabled or disabled.
uint8_t ai_passenger_only; ///< Bit value to tell AI that this engine is for passenger use only uint8_t ai_passenger_only = 0; ///< Bit value to tell AI that this engine is for passenger use only
uint16_t max_speed; ///< Maximum speed (1 unit = 1/1.6 mph = 1 km-ish/h) uint16_t max_speed = 0; ///< Maximum speed (1 unit = 1/1.6 mph = 1 km-ish/h)
uint16_t power; ///< Power of engine (hp); For multiheaded engines the sum of both engine powers. uint16_t power = 0; ///< Power of engine (hp); For multiheaded engines the sum of both engine powers.
uint16_t weight; ///< Weight of vehicle (tons); For multiheaded engines the weight of each single engine. uint16_t weight = 0; ///< Weight of vehicle (tons); For multiheaded engines the weight of each single engine.
uint8_t running_cost; ///< Running cost of engine; For multiheaded engines the sum of both running costs. uint8_t running_cost = 0; ///< Running cost of engine; For multiheaded engines the sum of both running costs.
Price running_cost_class; Price running_cost_class{};
EngineClass engclass; ///< Class of engine for this vehicle EngineClass engclass{}; ///< Class of engine for this vehicle
uint8_t capacity; ///< Cargo capacity of vehicle; For multiheaded engines the capacity of each single engine. uint8_t capacity = 0; ///< Cargo capacity of vehicle; For multiheaded engines the capacity of each single engine.
uint16_t pow_wag_power; ///< Extra power applied to consist if wagon should be powered uint16_t pow_wag_power = 0; ///< Extra power applied to consist if wagon should be powered
uint8_t pow_wag_weight; ///< Extra weight applied to consist if wagon should be powered uint8_t pow_wag_weight = 0; ///< Extra weight applied to consist if wagon should be powered
uint8_t visual_effect; ///< Bitstuffed NewGRF visual effect data uint8_t visual_effect = 0; ///< Bitstuffed NewGRF visual effect data
uint8_t shorten_factor; ///< length on main map for this type is 8 - shorten_factor uint8_t shorten_factor = 0; ///< length on main map for this type is 8 - shorten_factor
uint8_t tractive_effort; ///< Tractive effort coefficient uint8_t tractive_effort = 0; ///< Tractive effort coefficient
uint8_t air_drag; ///< Coefficient of air drag uint8_t air_drag = 0; ///< Coefficient of air drag
uint8_t user_def_data; ///< Property 0x25: "User-defined bit mask" Used only for (very few) NewGRF vehicles uint8_t user_def_data = 0; ///< Property 0x25: "User-defined bit mask" Used only for (very few) NewGRF vehicles
int16_t curve_speed_mod; ///< Modifier to maximum speed in curves (fixed-point binary with 8 fractional bits) int16_t curve_speed_mod = 0; ///< Modifier to maximum speed in curves (fixed-point binary with 8 fractional bits)
}; };
/** Information about a ship vehicle. */ /** Information about a ship vehicle. */
struct ShipVehicleInfo { struct ShipVehicleInfo {
uint8_t image_index; uint8_t image_index = 0;
uint8_t cost_factor; uint8_t cost_factor = 0;
uint8_t running_cost; uint8_t running_cost = 0;
uint8_t acceleration; ///< Acceleration (1 unit = 1/3.2 mph per tick = 0.5 km-ish/h per tick) uint8_t acceleration = 0; ///< Acceleration (1 unit = 1/3.2 mph per tick = 0.5 km-ish/h per tick)
uint16_t max_speed; ///< Maximum speed (1 unit = 1/3.2 mph = 0.5 km-ish/h) uint16_t max_speed = 0; ///< Maximum speed (1 unit = 1/3.2 mph = 0.5 km-ish/h)
uint16_t capacity; uint16_t capacity = 0;
SoundID sfx; SoundID sfx{};
bool old_refittable; ///< Is ship refittable; only used during initialisation. Later use EngineInfo::refit_mask. bool old_refittable = 0; ///< Is ship refittable; only used during initialisation. Later use EngineInfo::refit_mask.
uint8_t visual_effect; ///< Bitstuffed NewGRF visual effect data uint8_t visual_effect = 0; ///< Bitstuffed NewGRF visual effect data
uint8_t ocean_speed_frac; ///< Fraction of maximum speed for ocean tiles. uint8_t ocean_speed_frac = 0; ///< Fraction of maximum speed for ocean tiles.
uint8_t canal_speed_frac; ///< Fraction of maximum speed for canal/river tiles. uint8_t canal_speed_frac = 0; ///< Fraction of maximum speed for canal/river tiles.
/** Apply ocean/canal speed fraction to a velocity */ /** Apply ocean/canal speed fraction to a velocity */
uint ApplyWaterClassSpeedFrac(uint raw_speed, bool is_ocean) const uint ApplyWaterClassSpeedFrac(uint raw_speed, bool is_ocean) const
@ -102,34 +102,34 @@ enum AircraftSubTypeBits : uint8_t {
/** Information about a aircraft vehicle. */ /** Information about a aircraft vehicle. */
struct AircraftVehicleInfo { struct AircraftVehicleInfo {
uint8_t image_index; uint8_t image_index = 0;
uint8_t cost_factor; uint8_t cost_factor = 0;
uint8_t running_cost; uint8_t running_cost = 0;
uint8_t subtype; ///< Type of aircraft. @see AircraftSubTypeBits uint8_t subtype = 0; ///< Type of aircraft. @see AircraftSubTypeBits
SoundID sfx; SoundID sfx{};
uint16_t max_speed; ///< Maximum speed (1 unit = 8 mph = 12.8 km-ish/h) uint16_t max_speed = 0; ///< Maximum speed (1 unit = 8 mph = 12.8 km-ish/h)
uint8_t acceleration; uint8_t acceleration = 0;
uint8_t mail_capacity; ///< Mail capacity (bags). uint8_t mail_capacity = 0; ///< Mail capacity (bags).
uint16_t passenger_capacity; ///< Passenger capacity (persons). uint16_t passenger_capacity = 0; ///< Passenger capacity (persons).
uint16_t max_range; ///< Maximum range of this aircraft. uint16_t max_range = 0; ///< Maximum range of this aircraft.
}; };
/** Information about a road vehicle. */ /** Information about a road vehicle. */
struct RoadVehicleInfo { struct RoadVehicleInfo {
uint8_t image_index; uint8_t image_index = 0;
uint8_t cost_factor; uint8_t cost_factor = 0;
uint8_t running_cost; uint8_t running_cost = 0;
Price running_cost_class; Price running_cost_class{};
SoundID sfx; SoundID sfx{};
uint16_t max_speed; ///< Maximum speed (1 unit = 1/3.2 mph = 0.5 km-ish/h) uint16_t max_speed = 0; ///< Maximum speed (1 unit = 1/3.2 mph = 0.5 km-ish/h)
uint8_t capacity; uint8_t capacity = 0;
uint8_t weight; ///< Weight in 1/4t units uint8_t weight = 0; ///< Weight in 1/4t units
uint8_t power; ///< Power in 10hp units uint8_t power = 0; ///< Power in 10hp units
uint8_t tractive_effort; ///< Coefficient of tractive effort uint8_t tractive_effort = 0; ///< Coefficient of tractive effort
uint8_t air_drag; ///< Coefficient of air drag uint8_t air_drag = 0; ///< Coefficient of air drag
uint8_t visual_effect; ///< Bitstuffed NewGRF visual effect data uint8_t visual_effect = 0; ///< Bitstuffed NewGRF visual effect data
uint8_t shorten_factor; ///< length on main map for this type is 8 - shorten_factor uint8_t shorten_factor = 0; ///< length on main map for this type is 8 - shorten_factor
RoadType roadtype; ///< Road type RoadType roadtype{}; ///< Road type
}; };
/** /**
@ -168,23 +168,23 @@ using EngineMiscFlags = EnumBitSet<EngineMiscFlag, uint8_t>;
* @see table/engines.h * @see table/engines.h
*/ */
struct EngineInfo { struct EngineInfo {
TimerGameCalendar::Date base_intro; ///< Basic date of engine introduction (without random parts). TimerGameCalendar::Date base_intro{}; ///< Basic date of engine introduction (without random parts).
TimerGameCalendar::Year lifelength; ///< Lifetime of a single vehicle TimerGameCalendar::Year lifelength{}; ///< Lifetime of a single vehicle
TimerGameCalendar::Year base_life; ///< Basic duration of engine availability (without random parts). \c 0xFF means infinite life. TimerGameCalendar::Year base_life{}; ///< Basic duration of engine availability (without random parts). \c 0xFF means infinite life.
uint8_t decay_speed; uint8_t decay_speed = 0;
uint8_t load_amount; uint8_t load_amount = 0;
LandscapeTypes climates; ///< Climates supported by the engine. LandscapeTypes climates{}; ///< Climates supported by the engine.
CargoType cargo_type; CargoType cargo_type{};
std::variant<CargoLabel, MixedCargoType> cargo_label; std::variant<CargoLabel, MixedCargoType> cargo_label{};
CargoTypes refit_mask; CargoTypes refit_mask{};
uint8_t refit_cost; uint8_t refit_cost = 0;
EngineMiscFlags misc_flags; ///< Miscellaneous flags. @see EngineMiscFlags EngineMiscFlags misc_flags{}; ///< Miscellaneous flags. @see EngineMiscFlags
VehicleCallbackMasks callback_mask; ///< Bitmask of vehicle callbacks that have to be called VehicleCallbackMasks callback_mask{}; ///< Bitmask of vehicle callbacks that have to be called
int8_t retire_early; ///< Number of years early to retire vehicle int8_t retire_early = 0; ///< Number of years early to retire vehicle
ExtraEngineFlags extra_flags; ExtraEngineFlags extra_flags{};
StringID string_id; ///< Default name of engine StringID string_id = INVALID_STRING_ID; ///< Default name of engine
uint16_t cargo_age_period; ///< Number of ticks before carried cargo is aged. uint16_t cargo_age_period = 0; ///< Number of ticks before carried cargo is aged.
EngineID variant_id; ///< Engine variant ID. If set, will be treated specially in purchase lists. EngineID variant_id{}; ///< Engine variant ID. If set, will be treated specially in purchase lists.
}; };
/** /**