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

Merge tag '13.0-beta1' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-11-05 18:25:59 +00:00
parent a43a1902bb c4e655b1d4
commit 0bf1c9bb9d
14 changed files with 294 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vehicle_base.h
View File

@@ -59,7 +59,7 @@ enum VehicleFlags {
/* gap, above are common with upstream */
VF_SEPARATION_ACTIVE = 11, ///< Whether timetable auto-separation is currently active
VF_SCHEDULED_DISPATCH = 12, ///< Whether the vehicle should follow a timetabled dispatching schedule
VF_LAST_LOAD_ST_SEP = 13, ///< Each vehicle of this chain has its last_loading_station field set separately
VF_LAST_LOAD_ST_SEP = 13, ///< Each vehicle of this chain has its last_loading_station and last_loading_tick fields set separately
VF_TIMETABLE_SEPARATION = 14, ///< Whether timetable auto-separation is enabled
VF_AUTOMATE_TIMETABLE = 15, ///< Whether the vehicle should manage the timetable automatically.
VF_HAVE_SLOT = 16, ///< Vehicle has 1 or more slots
@@ -349,6 +349,7 @@ public:
StationID last_station_visited; ///< The last station we stopped at.
StationID last_loading_station; ///< Last station the vehicle has stopped at and could possibly leave from with any cargo loaded. (See VF_LAST_LOAD_ST_SEP).
uint64 last_loading_tick; ///< Last time (relative to _tick_counter) the vehicle has stopped at a station and could possibly leave with any cargo loaded. (See VF_LAST_LOAD_ST_SEP).
CargoID cargo_type; ///< type of cargo this vehicle is carrying
byte cargo_subtype; ///< Used for livery refits (NewGRF variations)