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

Merge branch 'tracerestrict' into tracerestrict-sx

Browse Source 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2017-03-20 19:19:18 +00:00
parent 58d8a791e4 2af2a49887
commit 88a524717b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/train.h
View File

@@ -61,7 +61,7 @@ byte FreightWagonMult(CargoID cargo);
void CheckTrainsLengths(); void CheckTrainsLengths();
void FreeTrainTrackReservation(const Train *v); void FreeTrainTrackReservation(const Train *v, TileIndex origin = INVALID_TILE, Trackdir orig_td = INVALID_TRACKDIR);
bool TryPathReserve(Train *v, bool mark_as_stuck = false, bool first_tile_okay = false); bool TryPathReserve(Train *v, bool mark_as_stuck = false, bool first_tile_okay = false);
int GetTrainStopLocation(StationID station_id, TileIndex tile, const Train *v, int *station_ahead, int *station_length); int GetTrainStopLocation(StationID station_id, TileIndex tile, const Train *v, int *station_ahead, int *station_length);

10
src/train_cmd.cpp
View File

@@ -2256,14 +2256,16 @@ static void ClearPathReservation(const Train *v, TileIndex tile, Trackdir track_
/** /**
* Free the reserved path in front of a vehicle. * Free the reserved path in front of a vehicle.
* @param v %Train owning the reserved path. * @param v %Train owning the reserved path.
* @param origin %Tile to start clearing (if #INVALID_TILE, use the current tile of \a v).
* @param orig_td Track direction (if #INVALID_TRACKDIR, use the track direction of \a v).
*/ */
void FreeTrainTrackReservation(const Train *v) void FreeTrainTrackReservation(const Train *v, TileIndex origin, Trackdir orig_td)
{ {
assert(v->IsFrontEngine()); assert(v->IsFrontEngine());
TileIndex tile = v->tile; TileIndex tile = origin != INVALID_TILE ? origin : v->tile;
Trackdir td = v->GetVehicleTrackdir(); Trackdir td = orig_td != INVALID_TRACKDIR ? orig_td : v->GetVehicleTrackdir();
bool free_tile = !(IsRailStationTile(v->tile) || IsTileType(v->tile, MP_TUNNELBRIDGE)); bool free_tile = tile != v->tile || !(IsRailStationTile(v->tile) || IsTileType(v->tile, MP_TUNNELBRIDGE));
StationID station_id = IsRailStationTile(v->tile) ? GetStationIndex(v->tile) : INVALID_STATION; StationID station_id = IsRailStationTile(v->tile) ? GetStationIndex(v->tile) : INVALID_STATION;
/* Can't be holding a reservation if we enter a depot. */ /* Can't be holding a reservation if we enter a depot. */