(svn r5155) - Remove the bridge branch merge (revision r5070)

2006-06-07 19:35:21 +00:00
parent 8992f9cb2b
commit 7fd88e5798
33 changed files with 1004 additions and 778 deletions
--- a/vehicle.h
+++ b/vehicle.h
@@ -287,6 +287,7 @@ uint32 VehicleEnterTile(Vehicle *v, TileIndex tile, int x, int y);

 StringID VehicleInTheWayErrMsg(const Vehicle* v);
 Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z);
+TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v);

 bool UpdateSignalsOnSegment(TileIndex tile, DiagDirection direction);
 void SetSignalsOnBothDir(TileIndex tile, byte track);