petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Shuffle Engine members around to reduce size. (#13115)

Browse Source 
Reduces overall size of Engine from 752 to 720 bytes.
This commit is contained in:
Peter Nelson
2024-11-22 23:58:13 +00:00
committed by GitHub
parent 16038879e4
commit a4b4095232
4 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/engine_base.h
View File

@@ -35,9 +35,15 @@ typedef Pool<Engine, EngineID, 64, 64000> EnginePool;
extern EnginePool _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_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.
std::string name; ///< Custom name of engine.
TimerGameCalendar::Date intro_date; ///< Date of introduction of the engine.
int32_t age; ///< Age of the engine in months.
uint16_t reliability; ///< Current reliability of the engine.
uint16_t reliability_spd_dec; ///< Speed of reliability decay between services (per day).
uint16_t reliability_start; ///< Initial reliability of the engine.
@@ -47,17 +53,14 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
uint16_t duration_phase_2; ///< Second reliability phase in months, keeping #reliability_max.
uint16_t duration_phase_3; ///< Third reliability phase in months, decaying to #reliability_final.
uint8_t flags; ///< Flags of the engine. @see EngineFlags
CompanyMask preview_asked; ///< Bit for each company which has already been offered a preview.
CompanyID preview_company; ///< Company which is currently being offered a preview \c INVALID_COMPANY means no company.
uint8_t preview_wait; ///< Daily countdown timer for timeout of offering the engine to the #preview_company 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.
uint8_t original_image_index; ///< Original vehicle image index, thus the image index of the overridden vehicle
VehicleType type; ///< %Vehicle type, ie #VEH_ROAD, #VEH_TRAIN, etc.
EngineDisplayFlags display_flags; ///< NOSAVE client-side-only display flags for build engine list.
EngineID display_last_variant; ///< NOSAVE client-side-only last variant selected.
EngineInfo info;
union {
@@ -67,6 +70,8 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
AircraftVehicleInfo air;
} u;
uint16_t list_position;
/* NewGRF related data */
/**
* Properties related the the grf file.
@@ -76,7 +81,6 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> {
*/
GRFFilePropsBase<NUM_CARGO + 2> grf_prop;
std::vector<WagonOverride> overrides;
uint16_t list_position;
Engine() {}
Engine(VehicleType type, EngineID base);