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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-05 23:45:34 +00:00
parent c98a5c37d3 8f350c9ae6
commit 0310fb0cdc
37 changed files with 2358 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/train.h
View File

@@ -179,7 +179,7 @@ struct Train FINAL : public GroundVehicle<Train, VEH_TRAIN> {
Money CalculateCurrentOverallValue() const;
Trackdir GetVehicleTrackdir() const override;
TileIndex GetOrderStationLocation(StationID station) override;
bool FindClosestDepot(TileIndex *location, DestinationID *destination, bool *reverse) override;
ClosestDepot FindClosestDepot() override;
void ReserveTrackUnderConsist() const;