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

Merge branch 'master' into jgrpp-nrt

Browse Source 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-07-13 20:34:52 +01:00
parent a200fcf4e9 a52bbb72a8
commit d3e0c3787f
50 changed files with 783 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/station_base.h
View File

@@ -467,10 +467,11 @@ public:
TileArea bus_station; ///< Tile area the bus 'station' part covers
RoadStop *truck_stops; ///< All the truck stops
TileArea truck_station; ///< Tile area the truck 'station' part covers
Dock *docks; ///< All the docks
TileArea dock_station; ///< Tile area dock 'station' part covers
Airport airport; ///< Tile area the airport covers
Airport airport; ///< Tile area the airport covers
TileArea ship_station; ///< Tile area the ship 'station' part covers
TileArea docking_station; ///< Tile area the docking tiles cover
std::vector<TileIndex> docking_tiles; ///< Tile vector the docking tiles cover
IndustryType indtype; ///< Industry type to get the name from
@@ -506,8 +507,6 @@ public:
void RecomputeCatchment();
static void RecomputeCatchmentForAll();
Dock *GetPrimaryDock() const { return docks; }
uint GetCatchmentRadius() const;
Rect GetCatchmentRectUsingRadius(uint radius) const;
inline Rect GetCatchmentRect() const
@@ -533,7 +532,6 @@ public:
return IsAirportTile(tile) && GetStationIndex(tile) == this->index;
}
bool IsDockingTile(TileIndex tile) const;
bool IsWithinRangeOfDockingTile(TileIndex tile, uint max_distance) const;
uint32 GetNewGRFVariable(const ResolverObject &object, byte variable, byte parameter, bool *available) const override;