Merge branches 'adjacent_crossings' and 'zoning' into jgrpp

2017-03-20 19:06:09 +00:00
parent 33cd1569f4 0c42b384bc 6f07639c34
commit fc60857b66
11 changed files with 68 additions and 83 deletions
--- a/src/train.h
+++ b/src/train.h
@@ -69,7 +69,7 @@ byte FreightWagonMult(CargoID cargo);

 void CheckTrainsLengths();

-void FreeTrainTrackReservation(const Train *v, TileIndex origin = INVALID_TILE, Trackdir orig_td = INVALID_TRACKDIR);
+void FreeTrainTrackReservation(const Train *v);
 bool TryPathReserve(Train *v, bool mark_as_stuck = false, bool first_tile_okay = false);

 void DeleteVisibleTrain(Train *v);