Re-order various structs to reduce holes/padding

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

View File

@@ -38,10 +38,10 @@ struct CFollowTrackT
};
const VehicleType *m_veh; ///< moving vehicle
Owner m_veh_owner; ///< owner of the vehicle
TileIndex m_old_tile; ///< the origin (vehicle moved from) before move
Trackdir m_old_td; ///< the trackdir (the vehicle was on) before move
TileIndex m_new_tile; ///< the new tile (the vehicle has entered)
Owner m_veh_owner; ///< owner of the vehicle
Trackdir m_old_td; ///< the trackdir (the vehicle was on) before move
TrackdirBits m_new_td_bits; ///< the new set of available trackdirs
DiagDirection m_exitdir; ///< exit direction (leaving the old tile)
bool m_is_tunnel; ///< last turn passed tunnel

View File

@@ -125,8 +125,6 @@ struct CYapfRailNodeT
CYapfRailSegment *m_segment;
uint16_t m_num_signals_passed;
uint16_t m_num_signals_res_through_passed;
TileIndex m_last_non_reserve_through_signal_tile;
Trackdir m_last_non_reserve_through_signal_td;
union {
uint32_t m_inherited_flags;
struct {
@@ -139,6 +137,8 @@ struct CYapfRailNodeT
} flags_u;
SignalType m_last_red_signal_type;
SignalType m_last_signal_type;
Trackdir m_last_non_reserve_through_signal_td;
TileIndex m_last_non_reserve_through_signal_tile;
inline void Set(CYapfRailNodeT *parent, TileIndex tile, Trackdir td, bool is_choice)
{