Merge branch 'adjacent_crossings' into jgrpp

# Conflicts:
#	src/road_func.h
This commit is contained in:
Jonathan G Rennison
2017-07-20 01:07:52 +01:00
2 changed files with 24 additions and 19 deletions

View File

@@ -179,7 +179,7 @@ bool HasRoadTypesAvail(const CompanyID company, const RoadTypes rts);
bool ValParamRoadType(const RoadType rt);
RoadTypes GetCompanyRoadtypes(const CompanyID company);
void UpdateLevelCrossing(TileIndex tile, bool sound = true);
void UpdateLevelCrossing(TileIndex tile, bool sound = true, bool force_close = false);
bool IsCrossingOccupiedByRoadVehicle(TileIndex t);
#endif /* ROAD_FUNC_H */