summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2017-03-20 17:49:44 +0000
committerpeter1138 <peter1138@openttd.org>2017-03-20 17:49:44 +0000
commit5951d2406e48449d517974e0edfd0a8cb847d144 (patch)
treed6c2da220d80dffbdece86b78ea78ac37945637c
parent890a44f130d2257a98b09a224791d26fee274554 (diff)
downloadopenttd-5951d2406e48449d517974e0edfd0a8cb847d144.tar.xz
(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation
FreeTrainTrackReservation is always called with INVALID_TILE and INVALID_TRACKDIR as second and third arguments, so remove them and just use those constants instead. (cirdan)
-rw-r--r--src/train.h2
-rw-r--r--src/train_cmd.cpp10
2 files changed, 5 insertions, 7 deletions
diff --git a/src/train.h b/src/train.h
index 82e33b67d..c40ab7556 100644
--- a/src/train.h
+++ b/src/train.h
@@ -61,7 +61,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);
int GetTrainStopLocation(StationID station_id, TileIndex tile, const Train *v, int *station_ahead, int *station_length);
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 4a279bb7e..608ce2fee 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2254,16 +2254,14 @@ static void ClearPathReservation(const Train *v, TileIndex tile, Trackdir track_
/**
* Free the reserved path in front of a vehicle.
* @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, TileIndex origin, Trackdir orig_td)
+void FreeTrainTrackReservation(const Train *v)
{
assert(v->IsFrontEngine());
- TileIndex tile = origin != INVALID_TILE ? origin : v->tile;
- Trackdir td = orig_td != INVALID_TRACKDIR ? orig_td : v->GetVehicleTrackdir();
- bool free_tile = tile != v->tile || !(IsRailStationTile(v->tile) || IsTileType(v->tile, MP_TUNNELBRIDGE));
+ TileIndex tile = v->tile;
+ Trackdir td = v->GetVehicleTrackdir();
+ bool free_tile = !(IsRailStationTile(v->tile) || IsTileType(v->tile, MP_TUNNELBRIDGE));
StationID station_id = IsRailStationTile(v->tile) ? GetStationIndex(v->tile) : INVALID_STATION;
/* Can't be holding a reservation if we enter a depot. */