dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-order various structs to reduce holes/padding

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-23 19:19:31 +00:00
parent b64a51876a
commit b01fd1607a
17 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/roadveh.h
View File

@@ -140,21 +140,19 @@ enum RoadVehicleFlags {
* Buses, trucks and trams belong to this class.
*/
struct RoadVehicle FINAL : public GroundVehicle<RoadVehicle, VEH_ROAD> {
std::unique_ptr<RoadVehPathCache> cached_path; ///< Cached path.
byte state; ///< @see RoadVehicleStates
byte frame;
uint16_t blocked_ctr;
byte overtaking; ///< Set to #RVSB_DRIVE_SIDE when overtaking, otherwise 0.
byte overtaking_ctr; ///< The length of the current overtake attempt.
std::unique_ptr<RoadVehPathCache> cached_path; ///< Cached path.
RoadTypes compatible_roadtypes; ///< Roadtypes this consist is powered on.
uint16_t crashed_ctr; ///< Animation counter when the vehicle has crashed. @see RoadVehIsCrashed
byte reverse_ctr;
byte critical_breakdown_count; ///< Counter for the number of critical breakdowns since last service
uint8_t rvflags; ///< Road vehicle flags
RoadType roadtype; ///< Roadtype of this vehicle.
RoadTypes compatible_roadtypes; ///< Roadtypes this consist is powered on.
byte critical_breakdown_count; ///< Counter for the number of critical breakdowns since last service
uint8_t rvflags; ///< Road vehicle flags
/** We don't want GCC to zero our struct! It already is zeroed and has an index! */
RoadVehicle() : GroundVehicleBase() {}